C++ build fixes #207
Merged
C++ build fixes #207
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
pepone
reviewed
May 28, 2024
pepone
reviewed
May 29, 2024
cpp/Chat/client/Client.cpp
Outdated
| const string message = "usage: "; | ||
| throw runtime_error(message + appName()); | ||
| } | ||
| throw runtime_error("Glaicer2::createSession return null. Is the SessionManager configured?"); |
There was a problem hiding this comment.
It seems you forgot to update the error message here.
cpp/Chat/client/Client.cpp
Outdated
Comment on lines
131
to
134
| auto callbackPrx = adapter->add(make_shared<ChatRoomCallbackI>(), id); | ||
|
|
||
| // Set the callback proxy on the session | ||
| session->setCallback(Chat::ChatRoomCallbackPrx{callbackPrx}); |
There was a problem hiding this comment.
Can we do this instead?
Suggested change
| auto callbackPrx = adapter->add(make_shared<ChatRoomCallbackI>(), id); | |
| // Set the callback proxy on the session | |
| session->setCallback(Chat::ChatRoomCallbackPrx{callbackPrx}); | |
| Chat::ChatRoomCallbackPrx callbackPrx = adapter->add(make_shared<ChatRoomCallbackI>(), id); | |
| // Set the callback proxy on the session | |
| session->setCallback(callbackPrx); |
| @@ -30,7 +30,7 @@ void | |||
| ChatRoom::join(const string& name, const shared_ptr<ChatRoomCallbackAdapter>& callback) | |||
| { | |||
| const lock_guard<mutex> sync(_mutex); | |||
| const long long timestamp = | |||
| const auto timestamp = | |||
There was a problem hiding this comment.
We use const long long timestamp = in a few other places, I would upgrade all for consistency.
cpp/Glacier2/callback/Client.cpp
Outdated
| optional<Ice::RouterPrx> defaultRouter = communicator->getDefaultRouter(); | ||
| if (!defaultRouter) | ||
| { | ||
| throw runtime_error("Glaicer2::createSession return null. Is the SessionManager configured?"); |
There was a problem hiding this comment.
We need to update the error message, this is not related to createSession.
| Ice::uncheckedCast<ChatSessionPrx>(current.adapter->createProxy(current.id)), | ||
| callback, | ||
| current); | ||
| chatRoom->enter(ChatSessionPrx(current.adapter->createProxy(current.id)), *callback, current); |
There was a problem hiding this comment.
Can we move callback?
Suggested change
| chatRoom->enter(ChatSessionPrx(current.adapter->createProxy(current.id)), *callback, current); | |
| chatRoom->enter(ChatSessionPrx(current.adapter->createProxy(current.id)), std::move(*callback), current); |
cpp/Glacier2/simpleChat/Client.cpp
Outdated
| optional<Ice::RouterPrx> defaultRouter = communicator->getDefaultRouter(); | ||
| if (!defaultRouter) | ||
| { | ||
| throw runtime_error("Glaicer2::createSession return null. Is the SessionManager configured?"); |
pepone
approved these changes
May 29, 2024
There was a problem hiding this comment.
Not clear what changed in this file besides the Ice version, the formatting?
There was a problem hiding this comment.
Yep that's it. I updated the IceStorm service plugin version and the formatting
cpp/Manual/lifecycle/Client.cpp
Outdated
There was a problem hiding this comment.
Why are we removing Manual/lifecycle demo?
There was a problem hiding this comment.
We removed this example from the docs a while back. This was supposed to have been removed then.
pepone
reviewed
May 29, 2024
cpp/Chat/client/Client.cpp
Outdated
| @@ -128,7 +128,7 @@ run(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 = Chat::ChatRoomCallbackPrx{adapter->add(make_shared<ChatRoomCallbackI>(), id)}; | |||
There was a problem hiding this comment.
or
Chat::ChatRoomCallbackPrx callbackPrx{adapter->add(make_shared<ChatRoomCallbackI>(), id)};
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR is the first step in getting the demos working again. Right now it just fixes the C++ builds. There's still optimizations to be made (using string_view, reducing optional usage, etc) in follow-up PRs.