From 2ab83e1abbf5ee6d00e16056a9e9394114026f28 Mon Sep 17 00:00:00 2001
From: Juan Linietsky
Date: Sat, 7 Jan 2017 18:25:37 -0300
Subject: Memory pool vectors (DVector) have been enormously simplified in
 code, and renamed to PoolVector

---
 platform/android/java_glue.cpp | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

(limited to 'platform/android/java_glue.cpp')

diff --git a/platform/android/java_glue.cpp b/platform/android/java_glue.cpp
index 602d22dfa..6d4794626 100644
--- a/platform/android/java_glue.cpp
+++ b/platform/android/java_glue.cpp
@@ -122,7 +122,7 @@ jvalret _variant_to_jvalue(JNIEnv *env, Variant::Type p_type, const Variant* p_a
 		} break;
 		case Variant::STRING_ARRAY: {
 
-			DVector<String> sarray = *p_arg;
+			PoolVector<String> sarray = *p_arg;
 			jobjectArray arr = env->NewObjectArray(sarray.size(),env->FindClass("java/lang/String"),env->NewStringUTF(""));
 
 			for(int j=0;j<sarray.size();j++) {
@@ -181,18 +181,18 @@ jvalret _variant_to_jvalue(JNIEnv *env, Variant::Type p_type, const Variant* p_a
 
 		case Variant::INT_ARRAY: {
 
-			DVector<int> array = *p_arg;
+			PoolVector<int> array = *p_arg;
 			jintArray arr = env->NewIntArray(array.size());
-			DVector<int>::Read r = array.read();
+			PoolVector<int>::Read r = array.read();
 			env->SetIntArrayRegion(arr,0,array.size(),r.ptr());
 			v.val.l=arr;
 			v.obj=arr;
 
 		} break;
 		case Variant::RAW_ARRAY: {
-			DVector<uint8_t> array = *p_arg;
+			PoolVector<uint8_t> array = *p_arg;
 			jbyteArray arr = env->NewByteArray(array.size());
-			DVector<uint8_t>::Read r = array.read();
+			PoolVector<uint8_t>::Read r = array.read();
 			env->SetByteArrayRegion(arr,0,array.size(),reinterpret_cast<const signed char*>(r.ptr()));
 			v.val.l=arr;
 			v.obj=arr;
@@ -200,9 +200,9 @@ jvalret _variant_to_jvalue(JNIEnv *env, Variant::Type p_type, const Variant* p_a
 		} break;
 		case Variant::REAL_ARRAY: {
 
-			DVector<float> array = *p_arg;
+			PoolVector<float> array = *p_arg;
 			jfloatArray arr = env->NewFloatArray(array.size());
-			DVector<float>::Read r = array.read();
+			PoolVector<float>::Read r = array.read();
 			env->SetFloatArrayRegion(arr,0,array.size(),r.ptr());
 			v.val.l=arr;
 			v.obj=arr;
@@ -259,7 +259,7 @@ Variant _jobject_to_variant(JNIEnv * env, jobject obj) {
 		jobjectArray arr = (jobjectArray)obj;
 		int stringCount = env->GetArrayLength(arr);
 		//print_line("String array! " + String::num(stringCount));
-		DVector<String> sarr;
+		PoolVector<String> sarr;
 
 		for (int i=0; i<stringCount; i++) {
 			jstring string = (jstring) env->GetObjectArrayElement(arr, i);
@@ -290,12 +290,12 @@ Variant _jobject_to_variant(JNIEnv * env, jobject obj) {
 
 		jintArray arr = (jintArray)obj;
 		int fCount = env->GetArrayLength(arr);
-		DVector<int> sarr;
+		PoolVector<int> sarr;
 		sarr.resize(fCount);
 
-		DVector<int>::Write w = sarr.write();
+		PoolVector<int>::Write w = sarr.write();
 		env->GetIntArrayRegion(arr,0,fCount,w.ptr());
-		w = DVector<int>::Write();
+		w = PoolVector<int>::Write();
 		return sarr;
 	};
 
@@ -303,12 +303,12 @@ Variant _jobject_to_variant(JNIEnv * env, jobject obj) {
 
 		jbyteArray arr = (jbyteArray)obj;
 		int fCount = env->GetArrayLength(arr);
-		DVector<uint8_t> sarr;
+		PoolVector<uint8_t> sarr;
 		sarr.resize(fCount);
 
-		DVector<uint8_t>::Write w = sarr.write();
+		PoolVector<uint8_t>::Write w = sarr.write();
 		env->GetByteArrayRegion(arr,0,fCount,reinterpret_cast<signed char*>(w.ptr()));
-		w = DVector<uint8_t>::Write();
+		w = PoolVector<uint8_t>::Write();
 		return sarr;
 	};
 
@@ -540,12 +540,12 @@ public:
 				jintArray arr = (jintArray)env->CallObjectMethodA(instance,E->get().method,v);
 
 				int fCount = env->GetArrayLength(arr);
-				DVector<int> sarr;
+				PoolVector<int> sarr;
 				sarr.resize(fCount);
 
-				DVector<int>::Write w = sarr.write();
+				PoolVector<int>::Write w = sarr.write();
 				env->GetIntArrayRegion(arr,0,fCount,w.ptr());
-				w = DVector<int>::Write();
+				w = PoolVector<int>::Write();
 				ret=sarr;
 				env->DeleteLocalRef(arr);
 			} break;
@@ -554,12 +554,12 @@ public:
 				jfloatArray arr = (jfloatArray)env->CallObjectMethodA(instance,E->get().method,v);
 
 				int fCount = env->GetArrayLength(arr);
-				DVector<float> sarr;
+				PoolVector<float> sarr;
 				sarr.resize(fCount);
 
-				DVector<float>::Write w = sarr.write();
+				PoolVector<float>::Write w = sarr.write();
 				env->GetFloatArrayRegion(arr,0,fCount,w.ptr());
-				w = DVector<float>::Write();
+				w = PoolVector<float>::Write();
 				ret=sarr;
 				env->DeleteLocalRef(arr);
 			} break;
-- 
cgit v1.2.3-70-g09d2