Skip to content

Commit 7647caa

Browse files
authored
Add _DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR flag (#77)
Also: Correct annotations on replicator creation
1 parent 79100bd commit 7647caa

File tree

3 files changed

+5
-0
lines changed

3 files changed

+5
-0
lines changed

android/lib/src/main/java/com/couchbase/lite/Replicator.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
//
1616
package com.couchbase.lite;
1717

18+
import androidx.annotation.GuardedBy;
1819
import androidx.annotation.NonNull;
1920
import androidx.annotation.Nullable;
2021
import androidx.annotation.VisibleForTesting;
@@ -52,6 +53,7 @@ public Replicator(@NonNull ReplicatorConfiguration config) {
5253
: new AndroidConnectivityObserver(mgr, Replicator.this::getC4Replicator);
5354
}
5455

56+
@GuardedBy("getDbLock()")
5557
@Override
5658
@NonNull
5759
protected C4Replicator createReplicatorForTarget(@NonNull Endpoint target) throws LiteCoreException {

java/lib/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -288,6 +288,7 @@ model {
288288
cppCompiler.args '/EHsc'
289289
cppCompiler.args '/wd4068'
290290
cppCompiler.args '/std:c++17'
291+
cppCompiler.args '-D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR'
291292
linker.args "/def:${ETC_DIR}/ld/jni_win.ld"
292293
}
293294
else if (targetPlatform.operatingSystem.linux) {

java/lib/src/main/java/com/couchbase/lite/Replicator.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
//
1616
package com.couchbase.lite;
1717

18+
import androidx.annotation.GuardedBy;
1819
import androidx.annotation.NonNull;
1920
import androidx.annotation.Nullable;
2021
import androidx.annotation.VisibleForTesting;
@@ -34,6 +35,7 @@ public final class Replicator extends AbstractReplicator {
3435
@VisibleForTesting
3536
Replicator(@Nullable NetworkConnectivityManager ignore, @NonNull ReplicatorConfiguration config) { super(config); }
3637

38+
@GuardedBy("getDbLock()")
3739
@NonNull
3840
@Override
3941
protected C4Replicator createReplicatorForTarget(@NonNull Endpoint target) throws LiteCoreException {

0 commit comments

Comments
 (0)