Fix C++ build (#222)

zeroc-ice · Dec 5, 2024 · 2462e71 · 2462e71
1 parent 2a3fde2
commit 2462e71
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 12 deletions.
diff --git a/cpp/Chat/client/Client.cpp b/cpp/Chat/client/Client.cpp
@@ -81,10 +81,10 @@ createSession(const Glacier2::RouterPrx& router)
 
         try
         {
-            optional<Chat::ChatSessionPrx> session{router->createSession(id, pw)};
+            auto session = Ice::uncheckedCast<Chat::ChatSessionPrx>(router->createSession(id, pw));
             if (!session)
             {
-                throw runtime_error("Glaicer2::createSession return null. Is the SessionManager configured?");
+                throw runtime_error("Glacier2::createSession return null. Is the SessionManager configured?");
             }
             router->ice_getCachedConnection()->setCloseCallback(
                 [](const Ice::ConnectionPtr&)
@@ -112,7 +112,7 @@ createSession(const Glacier2::RouterPrx& router)
 void
 run(const shared_ptr<Ice::Communicator>& communicator)
 {
-    optional<Glacier2::RouterPrx> router{communicator->getDefaultRouter()};
+    auto router = Ice::uncheckedCast<Glacier2::RouterPrx>(communicator->getDefaultRouter());
     if (!router)
     {
         throw runtime_error("Ice.Default.Router property not set.");
@@ -128,7 +128,7 @@ run(const shared_ptr<Ice::Communicator>& communicator)
     // provided by the router
     Ice::Identity id{Ice::generateUUID(), router->getCategoryForClient()};
 
-    Chat::ChatRoomCallbackPrx callbackPrx{adapter->add(make_shared<ChatRoomCallbackI>(), id)};
+    auto callbackPrx = adapter->add<Chat::ChatRoomCallbackPrx>(make_shared<ChatRoomCallbackI>(), id);
 
     // Set the callback proxy on the session
     session->setCallback(callbackPrx);

diff --git a/cpp/Glacier2/callback/Client.cpp b/cpp/Glacier2/callback/Client.cpp
@@ -62,7 +62,7 @@ run(const shared_ptr<Ice::Communicator>& communicator)
     {
         throw runtime_error("Ice.Default.Router property is not set.");
     }
-    const Glacier2::RouterPrx router = Glacier2::RouterPrx(*defaultRouter);
+    auto router = Ice::uncheckedCast<Glacier2::RouterPrx>(*defaultRouter);
 
     optional<Glacier2::SessionPrx> session;
     //

diff --git a/cpp/Glacier2/simpleChat/ChatSessionI.cpp b/cpp/Glacier2/simpleChat/ChatSessionI.cpp
@@ -89,7 +89,7 @@ ChatRoom::message(const string& data) const
     const lock_guard<mutex> sync(const_cast<mutex&>(_mutex));
     for (const auto& cb : _callbacks)
     {
-        cb->messageAsync(data);
+        cb->messageAsync(data, nullptr); // don't wait
     }
 }
 
@@ -154,7 +154,7 @@ ChatSessionI::setCallback(optional<ChatCallbackPrx> callback, const Ice::Current
         _callback = callback;
         auto chatRoom = ChatRoom::instance();
         chatRoom->message(_userId + " has entered the chat room.");
-        chatRoom->enter(ChatSessionPrx(current.adapter->createProxy(current.id)), std::move(*callback), current);
+        chatRoom->enter(current.adapter->createProxy<ChatSessionPrx>(current.id), std::move(*callback), current);
     }
 }
 

diff --git a/cpp/Glacier2/simpleChat/Client.cpp b/cpp/Glacier2/simpleChat/Client.cpp
@@ -70,7 +70,7 @@ run(const shared_ptr<Ice::Communicator>& communicator)
     {
         throw runtime_error("Ice.Default.Router property is not set.");
     }
-    const Glacier2::RouterPrx router = Glacier2::RouterPrx(*defaultRouter);
+    auto router = Ice::uncheckedCast<Glacier2::RouterPrx>(*defaultRouter);
     optional<ChatSessionPrx> session;
     while (!session)
     {

diff --git a/cpp/Ice/mtalk/Client.cpp b/cpp/Ice/mtalk/Client.cpp
@@ -381,7 +381,7 @@ ChatApp::disconnect(const Ice::Identity& id, const shared_ptr<Ice::Connection>&
         _peerAdapter->remove(id);
     }
 
-    con->close(Ice::ConnectionClose::Gracefully);
+    con->close().get();
 }
 
 void
@@ -574,7 +574,7 @@ ChatApp::failed(const Ice::LocalException& ex)
         auto con = peer->ice_getCachedConnection();
         if (con)
         {
-            con->close(Ice::ConnectionClose::Forcefully);
+            con->abort();
         }
     }
 }

diff --git a/cpp/Ice/plugin/LoggerPluginI.cpp b/cpp/Ice/plugin/LoggerPluginI.cpp
@@ -27,7 +27,7 @@ namespace
 
         string getPrefix() final { return ""; }
 
-        shared_ptr<Ice::Logger> cloneWithPrefix(const std::string&) final { return make_shared<LoggerI>(); }
+        shared_ptr<Ice::Logger> cloneWithPrefix(std::string) final { return make_shared<LoggerI>(); }
     };
 
 }

diff --git a/make/Make.rules.Darwin b/make/Make.rules.Darwin
@@ -33,7 +33,7 @@ endif
 # If building objects for a shared library, enable fPIC
 shared_cppflags = $(if $(filter-out program,$($1_target)),-fPIC) -fvisibility=hidden
 
-cppflags        = -Wall -Wextra -Wshadow -Wshadow-all -Wredundant-decls -Wno-shadow-field \
+cppflags        = -Wall -Wextra -Wshadow -Wshadow-all -Wredundant-decls -Wno-shadow-field -Wno-shadow-uncaptured-local \
                   -Wdeprecated -Wstrict-prototypes -Werror -Wconversion -Wdocumentation -pthread \
                   $(if $(filter yes,$(OPTIMIZE)),-O2 -DNDEBUG,-g)
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,7 +27,7 @@ namespace @@
             string getPrefix() final { return ""; }
-            shared_ptr<Ice::Logger> cloneWithPrefix(const std::string&) final { return make_shared<LoggerI>(); }
+            shared_ptr<Ice::Logger> cloneWithPrefix(std::string) final { return make_shared<LoggerI>(); }
         };
     }
@@ Expand Down @@