From 1320cf787bd3dc5f665b1d671a458c763cdb25f3 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Wed, 19 Mar 2025 17:59:12 +0100 Subject: [PATCH 1/2] Update Windows badges in README.md [skip ci] Part of https://github.com/gazebo-tooling/release-tools/issues/1288 Signed-off-by: Jose Luis Rivero --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 52994c5..dca3244 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Build | Status Test coverage | [![codecov](https://codecov.io/gh/gazebosim/gz-launch/tree/gz-launch8/graph/badge.svg)](https://codecov.io/gh/gazebosim/gz-launch/branch/gz-launch8) Ubuntu Noble | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=gz_launch-ci-gz-launch8-noble-amd64)](https://build.osrfoundation.org/job/gz_launch-ci-gz-launch8-noble-amd64) Homebrew | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=gz_launch-ci-gz-launch8-homebrew-amd64)](https://build.osrfoundation.org/job/gz_launch-ci-gz-launch8-homebrew-amd64) -Windows | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=gz_launch-8-win)](https://build.osrfoundation.org/job/gz_launch-8-win) +Windows | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=gz_launch-8-clowin)](https://build.osrfoundation.org/job/gz_launch-8-clowin) Gazebo Launch, a component of [Gazebo](https://gazebosim.org), provides a command line interface to run and manage application and plugins. From ae0a1cd4b7e1f086280f40db88a4bb7152b99b46 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Wed, 30 Jul 2025 19:54:47 +0200 Subject: [PATCH 2/2] Fix compatibility with protobuf v30 (cpp 6.30.0) (#299) Signed-off-by: Silvio Traversaro --- plugins/websocket_server/WebsocketServer.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/websocket_server/WebsocketServer.cc b/plugins/websocket_server/WebsocketServer.cc index a828c84..46985ac 100644 --- a/plugins/websocket_server/WebsocketServer.cc +++ b/plugins/websocket_server/WebsocketServer.cc @@ -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(), @@ -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(), @@ -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(), @@ -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(),