diff --git a/cpp/test/IceGrid/allocation/AllTests.cpp b/cpp/test/IceGrid/allocation/AllTests.cpp index 78233afe1c1..d5d306e08de 100644 --- a/cpp/test/IceGrid/allocation/AllTests.cpp +++ b/cpp/test/IceGrid/allocation/AllTests.cpp @@ -30,7 +30,7 @@ class Callback { lock_guard 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 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 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(); session->allocateObjectByIdAsync(Ice::stringToIdentity(os.str()), - [cb](shared_ptr o) { cb->response(move(o)); }, + [cb](shared_ptr o) { cb->response(std::move(o)); }, [cb](exception_ptr) { cb->exception(); }); session->destroy(); } @@ -228,8 +228,8 @@ class StressClient { auto cb = make_shared(); session->allocateObjectByTypeAsync("::StressTest", - [cb](shared_ptr o) { cb->response(move(o)); }, - [cb](exception_ptr) { cb->exception(); }); + [cb](shared_ptr 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 index dfa2b6c6bbb..f2aff630cfa 100644 --- a/cpp/test/IceGrid/allocation/TestI.cpp +++ b/cpp/test/IceGrid/allocation/TestI.cpp @@ -6,7 +6,7 @@ #include TestI::TestI(std::shared_ptr properties) : - _properties(move(properties)) + _properties(std::move(properties)) { } diff --git a/cpp/test/IceGrid/noRestartUpdate/TestI.cpp b/cpp/test/IceGrid/noRestartUpdate/TestI.cpp index bb70d9b8da7..4149e08d307 100644 --- a/cpp/test/IceGrid/noRestartUpdate/TestI.cpp +++ b/cpp/test/IceGrid/noRestartUpdate/TestI.cpp @@ -6,8 +6,8 @@ #include TestI::TestI(std::shared_ptr adapter, std::shared_ptr properties) : - _adapter(move(adapter)), - _properties(move(properties)) + _adapter(std::move(adapter)), + _properties(std::move(properties)) { }