refactored code to use android/database/CursorWindow instead of unnecessary clone into gp namespace

Author: n8fr8

jni/Android.mk

@@ -1,8 +1,7 @@
-uOCAL_PATH:= $(call my-dir)
+LOCAL_PATH:= $(call my-dir)
 
 EXTERNAL_PATH := ../external
 
-
 ifeq ($(TARGET_ARCH), arm)
 	LOCAL_CFLAGS += -DPACKED="__attribute__ ((packed))"
 else
@@ -22,13 +21,14 @@ endif
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES:= \
-	info_guardianproject_database_sqlcipher_SQLiteCompiledSql.cpp \
+	CursorWindow.cpp \
 	info_guardianproject_database_sqlcipher_SQLiteDatabase.cpp \
 	info_guardianproject_database_sqlcipher_SQLiteProgram.cpp \
 	info_guardianproject_database_sqlcipher_SQLiteQuery.cpp \
 	info_guardianproject_database_sqlcipher_SQLiteStatement.cpp \
-	info_guardianproject_database_CursorWindow.cpp \
-	CursorWindow.cpp
+	info_guardianproject_database_sqlcipher_SQLiteCompiledSql.cpp
+	#android_database_CursorWindow.cpp \
+	#info_guardianproject_database_CursorWindow.cpp \
 #	info_guardianproject_database_sqlcipher_SQLiteDebug.cpp
 
 LOCAL_C_INCLUDES += \

jni/CursorWindow.cpp

@@ -31,7 +31,7 @@
 #include "CursorWindow.h"
 
 
-namespace guardianproject {
+namespace android {
 
 CursorWindow::CursorWindow(size_t maxSize) :
     mMaxSize(maxSize)

jni/CursorWindow.h

@@ -62,7 +62,7 @@
 // When defined to true numberic values are stored inline in the field_slot_t, otherwise they're allocated in the window
 #define WINDOW_STORAGE_INLINE_NUMERICS 1
 
-namespace guardianproject {
+namespace android {
 
 typedef struct
 {