niklas/rmw_cyclonedds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make RMW version acceptable to MSVC (#58)

Browse source 
GCC and Clang support the ternary operator in macros, MSVC does not.

Signed-off-by: Erik Boasson <eb@ilities.com>
This commit is contained in:
eboasson 2019-10-25 18:14:45 +02:00 • committed by Scott K Logan
parent 951f5e2e23
commit 3817149010
1 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
rmw_cyclonedds_cpp/src/rmw_node.cpp
View file

@ -63,13 +63,10 @@
/* True if the version of RMW is at least major.minor.patch */ /* True if the version of RMW is at least major.minor.patch */
#define RMW_VERSION_GTE(major, minor, patch) ( \ #define RMW_VERSION_GTE(major, minor, patch) ( \
(major < RMW_VERSION_MAJOR) ? true \ major < RMW_VERSION_MAJOR || ( \
: (major > RMW_VERSION_MAJOR) ? false \ major == RMW_VERSION_MAJOR && ( \
: (minor < RMW_VERSION_MINOR) ? true \ minor < RMW_VERSION_MINOR || ( \
: (minor > RMW_VERSION_MINOR) ? false \ minor == RMW_VERSION_MINOR && patch <= RMW_VERSION_PATCH))))
: (patch < RMW_VERSION_PATCH) ? true \
: (patch > RMW_VERSION_PATCH) ? false \
: true)
/* Set to > 0 for printing warnings to stderr for each messages that was taken more than this many /* Set to > 0 for printing warnings to stderr for each messages that was taken more than this many
ms after writing */ ms after writing */