Unified Diff: jni/Utils.h
Issue 29329928:
Issue 3297 - Fix issues introduced by recent libadblockplus changes and update dependencies (Closed)
Patch Set:
Created Nov. 10, 2015, 4:32 p.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« jni/JniFilterEngine.cpp ('K')
|
« jni/JniShowNotificationCallback.cpp ('k')
|
src/org/adblockplus/android/ABPEngine.java » ('j')
|
src/org/adblockplus/libadblockplus/ShowNotificationCallback.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: jni/Utils.h |
| diff --git a/jni/Utils.h b/jni/Utils.h |
| index e7def9eea2ed98d7123ca051fde9b066ed63d759..8fdfcdc9c8c49f6b0be058b9d64b6f96cbcefa97 100644 |
| --- a/jni/Utils.h |
| +++ b/jni/Utils.h |
| @@ -22,9 +22,9 @@ |
| #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) ";" |
| @@ -120,7 +120,7 @@ public: |
| return reference; |
| } |
| - typedef std::tr1::shared_ptr<JniGlobalReference<T> > Ptr; |
| + typedef std::shared_ptr<JniGlobalReference<T> > Ptr; |
| private: |
| T reference; |
