Skip to content

Merge 8 -> main #301

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 18, 2025
Merged

Merge 8 -> main #301

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1320cf7
Update Windows badges in README.md [skip ci]
j-rivero Mar 19, 2025
ae0a1cd
Fix compatibility with protobuf v30 (cpp 6.30.0) (#299)
traversaro Jul 30, 2025
efab664
Forward port 8 to main
nkoenig Aug 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions plugins/websocket_server/WebsocketServer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1055,7 +1055,7 @@ void WebsocketServer::OnRequest(int _socketId,
gz::msgs::StringMsg msg;
msg.set_data("service_not_found");
std::string data = BUILD_MSG(this->operations[REQUEST], service,
msg.GetTypeName(), msg.SerializeAsString());
std::string(msg.GetTypeName()), msg.SerializeAsString());

// Queue the message for delivery.
this->QueueMessage(this->connections[_socketId].get(),
Expand Down Expand Up @@ -1094,7 +1094,7 @@ void WebsocketServer::OnAsset(int _socketId,
gz::msgs::StringMsg msg;
msg.set_data("asset_uri_missing");
std::string data = BUILD_MSG(this->operations[ASSET], "",
msg.GetTypeName(), msg.SerializeAsString());
std::string(msg.GetTypeName()), msg.SerializeAsString());

// Queue the message for delivery.
this->QueueMessage(this->connections[_socketId].get(),
Expand Down Expand Up @@ -1140,7 +1140,7 @@ void WebsocketServer::OnAsset(int _socketId,

// Construct the response message
std::string data = BUILD_MSG(this->operations[ASSET], assetUri,
bytes.GetTypeName(), bytes.SerializeAsString());
std::string(bytes.GetTypeName()), bytes.SerializeAsString());

// Queue the message for delivery.
this->QueueMessage(this->connections[_socketId].get(),
Expand All @@ -1151,7 +1151,7 @@ void WebsocketServer::OnAsset(int _socketId,
gz::msgs::StringMsg msg;
msg.set_data("asset_not_found");
std::string data = BUILD_MSG(this->operations[ASSET], assetUri,
msg.GetTypeName(), msg.SerializeAsString());
std::string(msg.GetTypeName()), msg.SerializeAsString());

// Queue the message for delivery.
this->QueueMessage(this->connections[_socketId].get(),
Expand Down
Loading