Browse Source

fix merge conflicts

JNI-129
heck 1 year ago
parent
commit
72e65bebe1
1 changed files with 2 additions and 2 deletions
  1. +2
    -2
      src/cxx/foundation_pEp_jniadapter_AbstractEngine.cc

+ 2
- 2
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);
}
JNIEXPORT void JNICALL Java_foundation_pEp_jniadapter_AbstractEngine_setDebugLogEnabled(
JNIEXPORT void JNICALL Java_foundation_pEp_jniadapter_AbstractEngine__1setDebugLogEnabled(
JNIEnv *env,
jclass clazz,
jboolean enabled)
@ -282,7 +282,7 @@ JNIEXPORT void JNICALL Java_foundation_pEp_jniadapter_AbstractEngine_setDebugLog
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,
jclass clazz
)


Loading…
Cancel
Save