Make the project build on XCode 14.3 (#503)

src/CBLBlob_CAPI.cc

@@ -108,7 +108,7 @@ CBLBlob* CBLBlob_CreateWithStream(FLString contentType,
                                   CBLBlobWriteStream* writer) noexcept
 {
     try {
-        return retain(new CBLNewBlob(contentType, move(*writer)));
+        return retain(new CBLNewBlob(contentType, std::move(*writer)));
     } catchAndWarn()
 }
 

src/CBLBlob_Internal.hh

@@ -27,6 +27,7 @@
 #include "c4Document.hh"
 #include "fleece/Fleece.hh"
 #include "fleece/Mutable.hh"
+#include <algorithm>
 #include <mutex>
 #include "betterassert.hh"
 
@@ -225,7 +226,7 @@ struct CBLBlobReadStream {
         }
         if (pos < 0)
             C4Error::raise(LiteCoreDomain, kC4ErrorInvalidParameter, "Seek to negative position");
-        pos = std::min(pos, _c4stream.getLength());
+        pos = std::min(pos, (int64_t) _c4stream.getLength());
         _c4stream.seek(pos);
         _pos = pos;
         return pos;

src/CBLDatabase.cc

@@ -175,7 +175,7 @@ Retained<CBLScope> CBLDatabase::getScope(slice scopeName) {
     if (!scope && exist) {
         auto retainedScope = make_retained<CBLScope>(scopeName, this);
         scope = retainedScope.get();
-        _scopes.insert({scope->name(), move(retainedScope)});
+        _scopes.insert({scope->name(), std::move(retainedScope)});
     }
 
     return scope;
@@ -289,7 +289,7 @@ Retained<CBLCollection> CBLDatabase::createCBLCollection(C4Collection* c4col, CB
     auto retainedCollection = make_retained<CBLCollection>(c4col, scope, const_cast<CBLDatabase*>(this));
     auto collection = retainedCollection.get();
     if (cache) {
-        _collections.insert({C4Database::CollectionSpec(c4col->getSpec()), move(retainedCollection)});
+        _collections.insert({C4Database::CollectionSpec(c4col->getSpec()), std::move(retainedCollection)});
     }
     return collection;
 }

src/CBLDocument.cc

@@ -144,7 +144,7 @@ bool CBLDocument::save(CBLCollection* collection, const SaveOptions &opt) {
                 t.commit();
                 _collection = collection;
                 // HACK: Replace the inner reference of the c4doc with the one from newDoc.
-                c4doc.get() = move(newDoc);
+                c4doc.get() = std::move(newDoc);
                 _revID = c4doc->selectedRev().revID;
                 success = true;
             } else {

src/CBLQuery_CAPI.cc

@@ -36,7 +36,7 @@ CBLQuery* CBLDatabase_CreateQuery(const CBLDatabase* db,
             C4Error::set(LiteCoreDomain, kC4ErrorInvalidQuery, {}, internal(outError));
             return nullptr;
         }
-        return move(query).detach();
+        return std::move(query).detach();
     } catchAndBridge(outError)
 }
 

src/ConflictResolver.cc

@@ -61,7 +61,7 @@ namespace cbl_internal {
     :_collection(collection)
     ,_clientResolver(customResolver)
     ,_clientResolverContext(context)
-    ,_docID(move(docID))
+    ,_docID(std::move(docID))
     {
         //SyncLog(Info, "ConflictResolver %p on %.*s", this, _docID.c_str());
     }

src/Internal.hh

@@ -19,6 +19,7 @@
 #pragma once
 #include "CBLBase.h"
 #include "CBLPlatform.h"
+#include "c4Base.h"
 #include "c4Base.hh"
 #include "fleece/slice.hh"
 #include "fleece/Fleece.hh"

src/Listener.cc

@@ -40,7 +40,7 @@ void NotificationQueue::setCallback(CBLNotificationsReadyCallback callback, void
     auto pending = _state.useLocked<Notifications>([&](State &state) {
         state.callback = callback;
         state.context = context;
-        return callback ? nullptr : move(state.queue);
+        return callback ? nullptr : std::move(state.queue);
     });
     call(pending);
 }
@@ -74,7 +74,7 @@ void NotificationQueue::add(Notification notification) {
 
 
 void NotificationQueue::notifyAll() {
-    auto queue = move(_state.useLocked()->queue);
+    auto queue = std::move(_state.useLocked()->queue);
     call(queue);
 }
 

test/CollectionTest_Cpp.cc

@@ -458,7 +458,7 @@ TEST_CASE_METHOD(CBLTest_Cpp, "Collection Listener Token") {
     CHECK(listenerToken.token() == listener);
 
     // Move Constructor:
-    ListenerToken<> listenerToken2 = move(listenerToken);
+    ListenerToken<> listenerToken2 = std::move(listenerToken);
     REQUIRE(listenerToken2.context());
     (*(ListenerToken<>::Callback*)listenerToken2.context())();
     CHECK(num == 2);
@@ -471,7 +471,7 @@ TEST_CASE_METHOD(CBLTest_Cpp, "Collection Listener Token") {
 #endif
 
     // Move Assignment:
-    listenerToken = move(listenerToken2);
+    listenerToken = std::move(listenerToken2);
     REQUIRE(listenerToken.context());
     (*(ListenerToken<>::Callback*)listenerToken.context())();
     CHECK(num == 3);
@@ -488,4 +488,4 @@ TEST_CASE_METHOD(CBLTest_Cpp, "Collection Listener Token") {
     CHECK(!listenerToken.context());
     CHECK(!listenerToken.context());
     listenerToken.remove(); // Noops
-}
+}

test/DatabaseTest_Cpp.cc

@@ -291,7 +291,7 @@ TEST_CASE_METHOD(CBLTest_Cpp, "Database Listener Token") {
     CHECK(listenerToken.token() == listener);
 
     // Move Constructor:
-    ListenerToken<> listenerToken2 = move(listenerToken);
+    ListenerToken<> listenerToken2 = std::move(listenerToken);
     REQUIRE(listenerToken2.context());
     (*(ListenerToken<>::Callback*)listenerToken2.context())();
     CHECK(num == 2);
@@ -304,7 +304,7 @@ TEST_CASE_METHOD(CBLTest_Cpp, "Database Listener Token") {
 #endif
 
     // Move Assignment:
-    listenerToken = move(listenerToken2);
+    listenerToken = std::move(listenerToken2);
     REQUIRE(listenerToken.context());
     (*(ListenerToken<>::Callback*)listenerToken.context())();
     CHECK(num == 3);

test/QueryTest_Cpp.cc

@@ -164,7 +164,7 @@ TEST_CASE_METHOD(QueryTest_Cpp, "Query Listener C++ Move Operation", "[Query][Qu
     resultCount = -1;
 
     // Move constructor:
-    Query::ChangeListener listenerToken2 = move(listenerToken);
+    Query::ChangeListener listenerToken2 = std::move(listenerToken);
     CHECK(listenerToken2.context());
     CHECK(listenerToken2.token());