Protobuf: Do not require version 3 do support Protobuf 4.23.2 (23.2) (#…

…2006) Signed-off-by: Silvio Traversaro <[email protected]> * TriggeredPublisher: don't catch FatalException It has been removed from recent versions of protobuf. Signed-off-by: Steve Peters <[email protected]> Co-authored-by: Steve Peters <[email protected]>
gazebosim · Jun 15, 2023 · b61f914 · b61f914
1 parent 1038a35
commit b61f914
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 10 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -146,9 +146,7 @@ set(IGN_TOOLS_VER 1)
 
 #--------------------------------------
 # Find protobuf
-set(REQ_PROTOBUF_VER 3)
 ign_find_package(IgnProtobuf
-                 VERSION ${REQ_PROTOBUF_VER}
                  REQUIRED
                  COMPONENTS all
                  PRETTY Protobuf)

diff --git a/src/systems/triggered_publisher/TriggeredPublisher.cc b/src/systems/triggered_publisher/TriggeredPublisher.cc
@@ -652,14 +652,7 @@ bool TriggeredPublisher::MatchInput(const transport::ProtoMsg &_inputMsg)
   return std::all_of(this->matchers.begin(), this->matchers.end(),
                      [&](const auto &_matcher)
                      {
-                       try
-                       {
-                         return _matcher->Match(_inputMsg);
-                       } catch (const google::protobuf::FatalException &err)
-                       {
-                          ignerr << err.what() << std::endl;
-                          return false;
-                       }
+                       return _matcher->Match(_inputMsg);
                      });
 }