From 381714901020ddce179ce3934a8950dfc90aae13 Mon Sep 17 00:00:00 2001 From: eboasson Date: Fri, 25 Oct 2019 18:14:45 +0200 Subject: [PATCH] Make RMW version acceptable to MSVC (#58) GCC and Clang support the ternary operator in macros, MSVC does not. Signed-off-by: Erik Boasson --- rmw_cyclonedds_cpp/src/rmw_node.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/rmw_cyclonedds_cpp/src/rmw_node.cpp b/rmw_cyclonedds_cpp/src/rmw_node.cpp index 55ddb3c..b6f510e 100644 --- a/rmw_cyclonedds_cpp/src/rmw_node.cpp +++ b/rmw_cyclonedds_cpp/src/rmw_node.cpp @@ -63,13 +63,10 @@ /* True if the version of RMW is at least major.minor.patch */ #define RMW_VERSION_GTE(major, minor, patch) ( \ - (major < RMW_VERSION_MAJOR) ? true \ - : (major > RMW_VERSION_MAJOR) ? false \ - : (minor < RMW_VERSION_MINOR) ? true \ - : (minor > RMW_VERSION_MINOR) ? false \ - : (patch < RMW_VERSION_PATCH) ? true \ - : (patch > RMW_VERSION_PATCH) ? false \ - : true) + major < RMW_VERSION_MAJOR || ( \ + major == RMW_VERSION_MAJOR && ( \ + minor < RMW_VERSION_MINOR || ( \ + minor == RMW_VERSION_MINOR && patch <= RMW_VERSION_PATCH)))) /* Set to > 0 for printing warnings to stderr for each messages that was taken more than this many ms after writing */