macOS build fixes

zeroc-ice · Jan 3, 2024 · 0a307b4 · 0a307b4
1 parent 3585ce9
commit 0a307b4
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/cpp/test/IceGrid/allocation/AllTests.cpp b/cpp/test/IceGrid/allocation/AllTests.cpp
@@ -30,7 +30,7 @@ class Callback
         {
             lock_guard<mutex> lg(_mutex);
             _response = true;
-            _obj = move(obj);
+            _obj = std::move(obj);
         }
 
         _condVar.notify_one();
@@ -81,7 +81,7 @@ class StressClient
 
     StressClient(int id, shared_ptr<RegistryPrx> registry, bool destroySession) :
         _id(id),
-        _registry(move(registry)),
+        _registry(std::move(registry)),
         _notified(false),
         _terminated(false),
         _destroySession(destroySession)
@@ -90,7 +90,7 @@ class StressClient
 
     StressClient(int id, shared_ptr<SessionPrx> session) :
         _id(id),
-        _session(move(session)),
+        _session(std::move(session)),
         _notified(false),
         _terminated(false),
         _destroySession(false)
@@ -218,7 +218,7 @@ class StressClient
 
         auto cb = make_shared<Callback>();
         session->allocateObjectByIdAsync(Ice::stringToIdentity(os.str()),
-                                         [cb](shared_ptr<Ice::ObjectPrx> o) { cb->response(move(o)); },
+                                         [cb](shared_ptr<Ice::ObjectPrx> o) { cb->response(std::move(o)); },
                                          [cb](exception_ptr) { cb->exception(); });
         session->destroy();
     }
@@ -228,8 +228,8 @@ class StressClient
     {
         auto cb = make_shared<Callback>();
         session->allocateObjectByTypeAsync("::StressTest",
-                                          [cb](shared_ptr<Ice::ObjectPrx> o) { cb->response(move(o)); },
-                                          [cb](exception_ptr) { cb->exception(); });
+                                           [cb](shared_ptr<Ice::ObjectPrx> o) { cb->response(std::move(o)); },
+                                           [cb](exception_ptr) { cb->exception(); });
         session->destroy();
     }
 

diff --git a/cpp/test/IceGrid/allocation/TestI.cpp b/cpp/test/IceGrid/allocation/TestI.cpp
@@ -6,7 +6,7 @@
 #include <TestI.h>
 
 TestI::TestI(std::shared_ptr<Ice::Properties> properties) :
-    _properties(move(properties))
+    _properties(std::move(properties))
 {
 }
 

diff --git a/cpp/test/IceGrid/noRestartUpdate/TestI.cpp b/cpp/test/IceGrid/noRestartUpdate/TestI.cpp
@@ -6,8 +6,8 @@
 #include <TestI.h>
 
 TestI::TestI(std::shared_ptr<Ice::ObjectAdapter> adapter, std::shared_ptr<Ice::Properties> properties) :
-    _adapter(move(adapter)),
-    _properties(move(properties))
+    _adapter(std::move(adapter)),
+    _properties(std::move(properties))
 {
 }