From b61f914e5c150c9025e22174126dea42f2599701 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Wed, 14 Jun 2023 07:20:11 +0200 Subject: [PATCH] Protobuf: Do not require version 3 do support Protobuf 4.23.2 (23.2) (#2006) Signed-off-by: Silvio Traversaro * TriggeredPublisher: don't catch FatalException It has been removed from recent versions of protobuf. Signed-off-by: Steve Peters Co-authored-by: Steve Peters --- CMakeLists.txt | 2 -- src/systems/triggered_publisher/TriggeredPublisher.cc | 9 +-------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ae902446a6..8f1a921d1d 100644 --- 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 index ee3b20dc86..fced273937 100644 --- 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); }); }