jni/JniJsEngine.cpp - Issue 29329928: Issue 3297 - Fix issues introduced by recent libadblockplus changes and update dependencies

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

Unified Diff: jni/JniJsEngine.cpp

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.

Jump to:

Index: jni/JniJsEngine.cpp

diff --git a/jni/JniJsEngine.cpp b/jni/JniJsEngine.cpp

index f8951f88b57e4a219f88ffbf7dd8a6a26042403e..227d0c7e7f022376f707c2027baa76306c2a8b23 100644

--- a/jni/JniJsEngine.cpp

+++ b/jni/JniJsEngine.cpp

@@ -25,7 +25,6 @@ static void TransformAppInfo(JNIEnv* env, jobject jAppInfo, AdblockPlus::AppInfo

appInfo.application = JniGetStringField(env, clazz, jAppInfo, "application");

appInfo.applicationVersion = JniGetStringField(env, clazz, jAppInfo, "applicationVersion");

- appInfo.id = JniGetStringField(env, clazz, jAppInfo, "id");

appInfo.locale = JniGetStringField(env, clazz, jAppInfo, "locale");

appInfo.name = JniGetStringField(env, clazz, jAppInfo, "name");

appInfo.version = JniGetStringField(env, clazz, jAppInfo, "version");

@@ -57,7 +56,7 @@ static void JNICALL JniSetEventCallback(JNIEnv* env, jclass clazz, jlong ptr, js

JniEventCallback* callback = JniLongToTypePtr<JniEventCallback>(jCallbackPtr);

std::string eventName = JniJavaToStdString(env, jEventName);

- AdblockPlus::JsEngine::EventCallback eCallback = std::tr1::bind(&JniEventCallback::Callback, callback, std::tr1::placeholders::_1);

+ AdblockPlus::JsEngine::EventCallback eCallback = std::bind(&JniEventCallback::Callback, callback, std::placeholders::_1);

try

{