Make the code built with xcode15

pasin · pasin · commit 792a005cdc69 · 2024-02-13T12:37:58.000-08:00
Update the code so that the project can be built with xcode15.
diff --git a/src/CBLBlob_CAPI.cc b/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()
 }
 
diff --git a/src/CBLDatabase.cc b/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;
@@ -201,7 +201,7 @@ Retained<CBLCollection> CBLDatabase::getCollection(slice collectionName, slice s
         return collection;
     }
     
-    auto c4col = c4db->getCollection(spec);
+    C4Collection* c4col = c4db->getCollection(spec);
     if (!c4col) {
         if (collection) {
             removeCBLCollection(spec); // Invalidate cache
@@ -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;
 }
diff --git a/src/CBLDocument.cc b/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 {
diff --git a/src/CBLQuery_CAPI.cc b/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)
 }
 
diff --git a/src/ConflictResolver.cc b/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());
     }
diff --git a/src/Listener.cc b/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);
 }
 
diff --git a/test/DatabaseTest_Cpp.cc b/test/DatabaseTest_Cpp.cc
@@ -458,7 +458,7 @@ TEST_CASE_METHOD(CBLTest_Cpp, "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, "Listener Token") {
 #endif
     
     // Move Assignment:
-    listenerToken = move(listenerToken2);
+    listenerToken = std::move(listenerToken2);
     REQUIRE(listenerToken.context());
     (*(ListenerToken<>::Callback*)listenerToken.context())();
     CHECK(num == 3);
diff --git a/test/QueryTest.cc b/test/QueryTest.cc
@@ -509,7 +509,7 @@ TEST_CASE_METHOD(QueryTest, "Query Listener", "[Query][LiveQuery]") {
     
     cerr << "Adding listener\n";
     ListenerState state;
-    auto listenerToken = CBLQuery_AddChangeListener(query, [](void *context, CBLQuery* query, CBLListenerToken* token) {
+    CBLListenerToken* listenerToken = CBLQuery_AddChangeListener(query, [](void *context, CBLQuery* query, CBLListenerToken* token) {
         ((ListenerState*)context)->receivedCallback(context, query, token);
     }, &state);
 
@@ -547,7 +547,7 @@ TEST_CASE_METHOD(QueryTest, "Remove Query Listener", "[Query][LiveQuery]") {
     
     cerr << "Adding listener\n";
     ListenerState state;
-    auto listenerToken = CBLQuery_AddChangeListener(query, [](void *context, CBLQuery* query, CBLListenerToken* token) {
+    CBLListenerToken* listenerToken = CBLQuery_AddChangeListener(query, [](void *context, CBLQuery* query, CBLListenerToken* token) {
         ((ListenerState*)context)->receivedCallback(context, query, token);
     }, &state);
 
@@ -589,7 +589,7 @@ TEST_CASE_METHOD(QueryTest, "Query Listener and Changing parameters", "[Query][L
 
     cerr << "Adding listener\n";
     ListenerState state;
-    auto listenerToken = CBLQuery_AddChangeListener(query, [](void *context, CBLQuery* query, CBLListenerToken* token) {
+    CBLListenerToken* listenerToken = CBLQuery_AddChangeListener(query, [](void *context, CBLQuery* query, CBLListenerToken* token) {
         ((ListenerState*)context)->receivedCallback(context, query, token);
     }, &state);
 
@@ -627,10 +627,10 @@ TEST_CASE_METHOD(QueryTest, "Multiple Query Listeners", "[Query][LiveQuery]") {
     
     cerr << "Adding listener\n";
     ListenerState state1;
-    auto token1 = CBLQuery_AddChangeListener(query, callback, &state1);
+    CBLListenerToken* token1 = CBLQuery_AddChangeListener(query, callback, &state1);
     
     ListenerState state2;
-    auto token2 = CBLQuery_AddChangeListener(query, callback, &state2);
+    CBLListenerToken* token2 = CBLQuery_AddChangeListener(query, callback, &state2);
 
     cerr << "Waiting for listener 1...\n";
     state1.waitForCount(1);
@@ -658,7 +658,7 @@ TEST_CASE_METHOD(QueryTest, "Multiple Query Listeners", "[Query][LiveQuery]") {
     
     cerr << "Adding another listener\n";
     ListenerState state3;
-    auto token3 = CBLQuery_AddChangeListener(query, callback, &state3);
+    CBLListenerToken* token3 = CBLQuery_AddChangeListener(query, callback, &state3);
     
     cerr << "Waiting for the listener 3...\n";
     state3.waitForCount(1);
@@ -688,7 +688,7 @@ TEST_CASE_METHOD(QueryTest, "Query Listener and Coalescing notification", "[Quer
     
     cerr << "Adding listener\n";
     ListenerState state;
-    auto listenerToken = CBLQuery_AddChangeListener(query, [](void *context, CBLQuery* query, CBLListenerToken* token) {
+    CBLListenerToken* listenerToken = CBLQuery_AddChangeListener(query, [](void *context, CBLQuery* query, CBLListenerToken* token) {
         ((ListenerState*)context)->receivedCallback(context, query, token);
     }, &state);
 
diff --git a/test/QueryTest_Cpp.cc b/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());
     

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ CBLBlob* CBLBlob_CreateWithStream(FLString contentType,`
`108`	`108`	`CBLBlobWriteStream* writer) noexcept`
`109`	`109`	`{`
`110`	`110`	`try {`
`111`		`- return retain(new CBLNewBlob(contentType, move(*writer)));`
	`111`	`+ return retain(new CBLNewBlob(contentType, std::move(*writer)));`
`112`	`112`	`} catchAndWarn()`
`113`	`113`	`}`
`114`	`114`
Original file line number	Diff line number	Diff line change
`@@ -175,7 +175,7 @@ Retained<CBLScope> CBLDatabase::getScope(slice scopeName) {`
`175`	`175`	`if (!scope && exist) {`
`176`	`176`	`auto retainedScope = make_retained<CBLScope>(scopeName, this);`
`177`	`177`	`scope = retainedScope.get();`
`178`		`- _scopes.insert({scope->name(), move(retainedScope)});`
	`178`	`+ _scopes.insert({scope->name(), std::move(retainedScope)});`
`179`	`179`	`}`
`180`	`180`
`181`	`181`	`return scope;`
`@@ -201,7 +201,7 @@ Retained<CBLCollection> CBLDatabase::getCollection(slice collectionName, slice s`
`201`	`201`	`return collection;`
`202`	`202`	`}`
`203`	`203`
`204`		`- auto c4col = c4db->getCollection(spec);`
	`204`	`+ C4Collection* c4col = c4db->getCollection(spec);`
`205`	`205`	`if (!c4col) {`
`206`	`206`	`if (collection) {`
`207`	`207`	`removeCBLCollection(spec); // Invalidate cache`
`@@ -289,7 +289,7 @@ Retained<CBLCollection> CBLDatabase::createCBLCollection(C4Collection* c4col, CB`
`289`	`289`	`auto retainedCollection = make_retained<CBLCollection>(c4col, scope, const_cast<CBLDatabase*>(this));`
`290`	`290`	`auto collection = retainedCollection.get();`
`291`	`291`	`if (cache) {`
`292`		`- _collections.insert({C4Database::CollectionSpec(c4col->getSpec()), move(retainedCollection)});`
	`292`	`+ _collections.insert({C4Database::CollectionSpec(c4col->getSpec()), std::move(retainedCollection)});`
`293`	`293`	`}`
`294`	`294`	`return collection;`
`295`	`295`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ CBLQuery* CBLDatabase_CreateQuery(const CBLDatabase* db,`
`36`	`36`	`C4Error::set(LiteCoreDomain, kC4ErrorInvalidQuery, {}, internal(outError));`
`37`	`37`	`return nullptr;`
`38`	`38`	`}`
`39`		`- return move(query).detach();`
	`39`	`+ return std::move(query).detach();`
`40`	`40`	`} catchAndBridge(outError)`
`41`	`41`	`}`
`42`	`42`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ namespace cbl_internal {`
`61`	`61`	`:_collection(collection)`
`62`	`62`	`,_clientResolver(customResolver)`
`63`	`63`	`,_clientResolverContext(context)`
`64`		`- ,_docID(move(docID))`
	`64`	`+ ,_docID(std::move(docID))`
`65`	`65`	`{`
`66`	`66`	`//SyncLog(Info, "ConflictResolver %p on %.*s", this, _docID.c_str());`
`67`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ void NotificationQueue::setCallback(CBLNotificationsReadyCallback callback, void`
`40`	`40`	`auto pending = _state.useLocked<Notifications>([&](State &state) {`
`41`	`41`	`state.callback = callback;`
`42`	`42`	`state.context = context;`
`43`		`- return callback ? nullptr : move(state.queue);`
	`43`	`+ return callback ? nullptr : std::move(state.queue);`
`44`	`44`	`});`
`45`	`45`	`call(pending);`
`46`	`46`	`}`
`@@ -74,7 +74,7 @@ void NotificationQueue::add(Notification notification) {`
`74`	`74`
`75`	`75`
`76`	`76`	`void NotificationQueue::notifyAll() {`
`77`		`- auto queue = move(_state.useLocked()->queue);`
	`77`	`+ auto queue = std::move(_state.useLocked()->queue);`
`78`	`78`	`call(queue);`
`79`	`79`	`}`
`80`	`80`