From ee35a6c41a3ffcf141903dc451580a3bd3ed79cc Mon Sep 17 00:00:00 2001
From: eboasson <eb@ilities.com>
Date: Fri, 31 Jan 2020 13:37:49 +0100
Subject: [PATCH] rmw_get_topic_endpoint_info doesn't exist on Dashing (#91)

* rmw_get_topic_endpoint_info doesn't exist on Dashing

Signed-off-by: Erik Boasson <eb@ilities.com>

* get_topic_endpoint_info got added in RMW 0.8.2

Signed-off-by: Erik Boasson <eb@ilities.com>
---
 .../rmw_cyclonedds_cpp/rmw_version_test.hpp   | 24 +++++++++++++++++++
 .../src/rmw_get_topic_endpoint_info.cpp       |  6 +++++
 rmw_cyclonedds_cpp/src/rmw_node.cpp           |  8 +------
 3 files changed, 31 insertions(+), 7 deletions(-)
 create mode 100644 rmw_cyclonedds_cpp/include/rmw_cyclonedds_cpp/rmw_version_test.hpp

diff --git a/rmw_cyclonedds_cpp/include/rmw_cyclonedds_cpp/rmw_version_test.hpp b/rmw_cyclonedds_cpp/include/rmw_cyclonedds_cpp/rmw_version_test.hpp
new file mode 100644
index 0000000..4ec9bc6
--- /dev/null
+++ b/rmw_cyclonedds_cpp/include/rmw_cyclonedds_cpp/rmw_version_test.hpp
@@ -0,0 +1,24 @@
+// Copyright 2019 ADLINK Technology
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+#ifndef RMW_CYCLONEDDS_CPP__RMW_VERSION_TEST_HPP_
+#define RMW_CYCLONEDDS_CPP__RMW_VERSION_TEST_HPP_
+
+/* True if the version of RMW is at least major.minor.patch */
+#define RMW_VERSION_GTE(major, minor, patch) ( \
+    major < RMW_VERSION_MAJOR || ( \
+      major == RMW_VERSION_MAJOR && ( \
+        minor < RMW_VERSION_MINOR || ( \
+          minor == RMW_VERSION_MINOR && patch <= RMW_VERSION_PATCH))))
+
+#endif  // RMW_CYCLONEDDS_CPP__RMW_VERSION_TEST_HPP_
diff --git a/rmw_cyclonedds_cpp/src/rmw_get_topic_endpoint_info.cpp b/rmw_cyclonedds_cpp/src/rmw_get_topic_endpoint_info.cpp
index 6b482d7..16176a9 100644
--- a/rmw_cyclonedds_cpp/src/rmw_get_topic_endpoint_info.cpp
+++ b/rmw_cyclonedds_cpp/src/rmw_get_topic_endpoint_info.cpp
@@ -12,6 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include "rmw_cyclonedds_cpp/rmw_version_test.hpp"
+
+#if RMW_VERSION_GTE(0, 8, 2)
+
 #include "rmw/error_handling.h"
 #include "rmw/get_topic_endpoint_info.h"
 #include "rmw/topic_endpoint_info_array.h"
@@ -40,3 +44,5 @@ rmw_get_subscriptions_info_by_topic(
   return RMW_RET_UNSUPPORTED;
 }
 }  // extern "C"
+
+#endif
diff --git a/rmw_cyclonedds_cpp/src/rmw_node.cpp b/rmw_cyclonedds_cpp/src/rmw_node.cpp
index f353e02..adfb420 100644
--- a/rmw_cyclonedds_cpp/src/rmw_node.cpp
+++ b/rmw_cyclonedds_cpp/src/rmw_node.cpp
@@ -46,6 +46,7 @@
 
 #include "TypeSupport2.hpp"
 
+#include "rmw_cyclonedds_cpp/rmw_version_test.hpp"
 #include "rmw_cyclonedds_cpp/MessageTypeSupport.hpp"
 #include "rmw_cyclonedds_cpp/ServiceTypeSupport.hpp"
 
@@ -66,13 +67,6 @@
 #define MULTIDOMAIN 0
 #endif
 
-/* True if the version of RMW is at least major.minor.patch */
-#define RMW_VERSION_GTE(major, minor, patch) ( \
-    major < RMW_VERSION_MAJOR || ( \
-      major == RMW_VERSION_MAJOR && ( \
-        minor < RMW_VERSION_MINOR || ( \
-          minor == RMW_VERSION_MINOR && patch <= RMW_VERSION_PATCH))))
-
 #if RMW_VERSION_GTE(0, 8, 1) && MULTIDOMAIN
 #define SUPPORT_LOCALHOST 1
 #else