diff --git a/CMakeLists.txt b/CMakeLists.txt index cbf24cba..f2ba7ae6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -38,7 +38,6 @@ message(STATUS "\n\n-- ====== Finding Dependencies ======") # Find Protobuf set(REQ_PROTOBUF_VER 3) ign_find_package(IgnProtobuf - VERSION ${REQ_PROTOBUF_VER} REQUIRED PRETTY Protobuf) diff --git a/include/ignition/transport/RepHandler.hh b/include/ignition/transport/RepHandler.hh index e826fd6b..4719aa4b 100644 --- a/include/ignition/transport/RepHandler.hh +++ b/include/ignition/transport/RepHandler.hh @@ -26,7 +26,7 @@ #pragma warning(pop) #endif -#if GOOGLE_PROTOBUF_VERSION > 2999999 +#if GOOGLE_PROTOBUF_VERSION > 2999999 && GOOGLE_PROTOBUF_VERSION < 4022000 #include #endif @@ -140,7 +140,11 @@ namespace ignition return false; } -#if GOOGLE_PROTOBUF_VERSION > 2999999 +#if GOOGLE_PROTOBUF_VERSION >= 4022000 + auto msgReq = + google::protobuf::internal::DownCast(&_msgReq); + auto msgRep = google::protobuf::internal::DownCast(&_msgRep); +#elif GOOGLE_PROTOBUF_VERSION > 2999999 auto msgReq = google::protobuf::down_cast(&_msgReq); auto msgRep = google::protobuf::down_cast(&_msgRep); #else diff --git a/include/ignition/transport/SubscriptionHandler.hh b/include/ignition/transport/SubscriptionHandler.hh index 96811afe..a8d7ebcd 100644 --- a/include/ignition/transport/SubscriptionHandler.hh +++ b/include/ignition/transport/SubscriptionHandler.hh @@ -28,7 +28,7 @@ #include -#if GOOGLE_PROTOBUF_VERSION >= 3000000 +#if GOOGLE_PROTOBUF_VERSION >= 3000000 && GOOGLE_PROTOBUF_VERSION < 4022000 #include #endif @@ -211,7 +211,9 @@ namespace ignition if (!this->UpdateThrottling()) return true; -#if GOOGLE_PROTOBUF_VERSION >= 3000000 +#if GOOGLE_PROTOBUF_VERSION >= 4022000 + auto msgPtr = google::protobuf::internal::DownCast(&_msg); +#elif GOOGLE_PROTOBUF_VERSION >= 3000000 auto msgPtr = google::protobuf::down_cast(&_msg); #else auto msgPtr = google::protobuf::internal::down_cast(&_msg);