Dependencies: Compatibility with protobuf >= v22.0 (#1155)

Plus reactivate newest protobuf version for MacOS GH Actions build --------- Co-authored-by: Kerstin Keller <[email protected]> Co-authored-by: Florian Reimold <[email protected]>
eclipse-ecal · Aug 7, 2023 · bf4348e · bf4348e
1 parent 14fd6bc
commit bf4348e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
@@ -25,7 +25,7 @@ jobs:
         target: 'desktop'
 
     - name: Install Dependencies
-      run: brew install ninja doxygen graphviz protobuf@21 hdf5 pkg-config
+      run: brew install ninja doxygen graphviz protobuf hdf5 pkg-config
 
     - name: Install Cap’n Proto
       run: |
@@ -85,8 +85,8 @@ jobs:
         -DECAL_THIRDPARTY_BUILD_QWT=ON \
         -DECAL_THIRDPARTY_BUILD_YAML-CPP=ON \
         -DCMAKE_BUILD_TYPE=Release \
-        -DCMAKE_PREFIX_PATH=/usr/local/opt/protobuf@21 \
-        -DCMAKE_CXX_STANDARD=14 \
+        -DCMAKE_CXX_STANDARD=17 \
+        -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON \
         -DPython_FIND_STRATEGY=LOCATION \
         -DPython_FIND_REGISTRY=NEVER
         sudo mkdir /etc/ecal

diff --git a/samples/cpp/services/ping_client_dyn/src/proto_json_conv.cpp b/samples/cpp/services/ping_client_dyn/src/proto_json_conv.cpp
@@ -33,7 +33,7 @@ std::string GetSerialzedMessageFromJSON(google::protobuf::Message* msg_proto_, c
   }
 
   // read JSON string into message object
-  google::protobuf::util::Status status = google::protobuf::util::JsonStringToMessage(msg_json_, msg_proto_);
+  auto status = google::protobuf::util::JsonStringToMessage(msg_json_, msg_proto_);
   if (!status.ok())
   {
     std::cerr << "Could not convert JSON to google message." << std::endl;
@@ -60,7 +60,7 @@ std::string GetJSONFromSerialzedMessage(google::protobuf::Message* msg_proto_, c
 
   // convert message object to JSON string
   std::string msg_json;
-  google::protobuf::util::Status status = google::protobuf::util::MessageToJsonString(*msg_proto_, &msg_json);
+  auto status = google::protobuf::util::MessageToJsonString(*msg_proto_, &msg_json);
   if (!status.ok())
   {
     std::cerr << "Could not convert google message to JSON." << std::endl;