pEp.foundation
/
pEpJNIAdapter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

fix merge conflicts

JNI-129
heck 4 years ago
parent
8b17579b69
commit
72e65bebe1
1 changed files with 2 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/cxx/foundation_pEp_jniadapter_AbstractEngine.cc

4
src/cxx/foundation_pEp_jniadapter_AbstractEngine.cc
View File

@ -274,7 +274,7 @@ JNIEXPORT void JNICALL Java_foundation_pEp_jniadapter_AbstractEngine_release(JNI
Adapter::session(pEp::Adapter::release); Adapter::session(pEp::Adapter::release);
} }
JNIEXPORT void JNICALL Java_foundation_pEp_jniadapter_AbstractEngine_setDebugLogEnabled( JNIEXPORT void JNICALL Java_foundation_pEp_jniadapter_AbstractEngine__1setDebugLogEnabled(
JNIEnv *env, JNIEnv *env,
jclass clazz, jclass clazz,
jboolean enabled) jboolean enabled)
@ -282,7 +282,7 @@ JNIEXPORT void JNICALL Java_foundation_pEp_jniadapter_AbstractEngine_setDebugLog
Adapter::pEpLog::set_enabled(static_cast<bool>(enabled)); Adapter::pEpLog::set_enabled(static_cast<bool>(enabled));
} }
JNIEXPORT jboolean JNICALL Java_foundation_pEp_jniadapter_AbstractEngine_getDebugLogEnabled( JNIEXPORT jboolean JNICALL Java_foundation_pEp_jniadapter_AbstractEngine__1getDebugLogEnabled(
JNIEnv *env, JNIEnv *env,
jclass clazz jclass clazz
) )

Write Preview
Loading…
Cancel
Save