Commit 7945a00d authored by Fredrik Orderud's avatar Fredrik Orderud

Prefix GlobalRefDeleter & LocalRefDeleter with djinni namespace when being...

Prefix GlobalRefDeleter & LocalRefDeleter with djinni namespace when being used as unique_ptr deleter.

Work-around for MSVC2013 bug:
https://connect.microsoft.com/VisualStudio/feedback/details/781054
parent d48dea91
...@@ -96,9 +96,9 @@ class GlobalRef : public std::unique_ptr<typename std::remove_pointer<PointerTyp ...@@ -96,9 +96,9 @@ class GlobalRef : public std::unique_ptr<typename std::remove_pointer<PointerTyp
public: public:
GlobalRef() {} GlobalRef() {}
GlobalRef(JNIEnv * env, PointerType localRef) GlobalRef(JNIEnv * env, PointerType localRef)
: std::unique_ptr<typename std::remove_pointer<PointerType>::type, GlobalRefDeleter>( : std::unique_ptr<typename std::remove_pointer<PointerType>::type, ::djinni::GlobalRefDeleter>(
static_cast<PointerType>(env->NewGlobalRef(localRef)), static_cast<PointerType>(env->NewGlobalRef(localRef)),
GlobalRefDeleter{} ::djinni::GlobalRefDeleter{}
) {} ) {}
}; };
...@@ -110,7 +110,7 @@ class LocalRef : public std::unique_ptr<typename std::remove_pointer<PointerType ...@@ -110,7 +110,7 @@ class LocalRef : public std::unique_ptr<typename std::remove_pointer<PointerType
public: public:
LocalRef() {} LocalRef() {}
LocalRef(JNIEnv * /*env*/, PointerType localRef) LocalRef(JNIEnv * /*env*/, PointerType localRef)
: std::unique_ptr<typename std::remove_pointer<PointerType>::type, LocalRefDeleter>( : std::unique_ptr<typename std::remove_pointer<PointerType>::type, ::djinni::LocalRefDeleter>(
localRef) {} localRef) {}
explicit LocalRef(PointerType localRef) explicit LocalRef(PointerType localRef)
: std::unique_ptr<typename std::remove_pointer<PointerType>::type, LocalRefDeleter>( : std::unique_ptr<typename std::remove_pointer<PointerType>::type, LocalRefDeleter>(
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment