Issue 3297 - Fix issues introduced by recent libadblockplus changes and update dependencies

jni/Utils.h

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef UTILS_H
 #define UTILS_H
 
 #include <string>
 #include <algorithm>
 #include <jni.h>
 #include <stdexcept>
+#include <memory>
 
 #include <AdblockPlus.h>
-#include <AdblockPlus/tr1_memory.h>
 
 #define PKG(x) "org/adblockplus/libadblockplus/" x
 #define TYP(x) "L" PKG(x) ";"
 
 #define ABP_JNI_VERSION JNI_VERSION_1_6
 
 void JniThrowException(JNIEnv* env, const std::string& message);
 
 void JniThrowException(JNIEnv* env, const std::exception& e);
 
@@ skipping 75 matching lines @@
   }
 
   JniGlobalReference(const JniGlobalReference& other);
   JniGlobalReference& operator=(const JniGlobalReference& other);
 
   T Get()
   {
     return reference;
   }
 
-  typedef std::tr1::shared_ptr<JniGlobalReference<T> > Ptr;
+  typedef std::shared_ptr<JniGlobalReference<T> > Ptr;
 
 private:
   T reference;
   JavaVM* javaVM;
 };
 
 inline void* JniLongToPtr(jlong value)
 {
   return reinterpret_cast<void*>((size_t)value);
 }
@@ skipping 63 matching lines @@
     JniThrowException(jEnv, except); \
     return retVal; \
   } \
   catch (...) \
   { \
     JniThrowException(jEnv); \
     return retVal; \
   }
 
 #endif