Issue 4231 - Fix unstable FilterEngineTest.testSetRemoveFilterChangeCallback

libadblockplus-android/jni/Utils.h

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2017 eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 13 matching lines @@
 #include <stdexcept>
 #include <memory>
 
 #include <AdblockPlus.h>
 
 #define PKG(x) "org/adblockplus/libadblockplus/" x
 #define TYP(x) "L" PKG(x) ";"
 
 #define ABP_JNI_VERSION JNI_VERSION_1_6
 
+namespace AdblockPlus

[sergei, 2017/08/07 12:50:00]

This will be removed after rabasing.

+{
+  namespace Utils
+  {
+    std::string Slurp(std::istream& stream);
+  }
+}
+
 void JniUtils_OnLoad(JavaVM* vm, JNIEnv* env, void* reserved);
 
 void JniUtils_OnUnload(JavaVM* vm, JNIEnv* env, void* reserved);
 
 void JniThrowException(JNIEnv* env, const std::string& message);
 
 void JniThrowException(JNIEnv* env, const std::exception& e);
 
 void JniThrowException(JNIEnv* env);
 
@@ skipping 102 matching lines @@
 // dynamic_casts to shared_ptr<T: JsValue> ... also as the same inheritance is mirrored on the Java
 // side (and Java will throw a class cast exception on error) this shouldn't be an issue (TM)
 template<typename T>
 inline T* JniLongToTypePtr(jlong value)
 {
   return reinterpret_cast<T*>((size_t)value);
 }
 
 std::string JniJavaToStdString(JNIEnv* env, jstring str);
 jstring JniStdStringToJava(JNIEnv* env, std::string str);
-std::string JniStdStreamToStdString(std::istream *in);
 
 jmethodID JniGetAddToListMethod(JNIEnv* env, jobject list);
 
 void JniAddObjectToList(JNIEnv* env, jobject list, jmethodID addMethod, jobject value);
 
 void JniAddObjectToList(JNIEnv* env, jobject list, jobject value);
 
 inline std::string JniGetStringField(JNIEnv* env, jclass clazz, jobject jObj, const char* name)
 {
   return JniJavaToStdString(env, reinterpret_cast<jstring>(env->GetObjectField(jObj, env->GetFieldID(clazz, name, "Ljava/lang/String;"))));
@@ skipping 45 matching lines @@
     JniThrowException(jEnv, except); \
     return retVal; \
   } \
   catch (...) \
   { \
     JniThrowException(jEnv); \
     return retVal; \
   }
 
 #endif