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

rmw_get_topic_endpoint_info doesn't exist on Dashing (#91)

Browse source 
* 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>
This commit is contained in:
eboasson 2020-01-31 13:37:49 +01:00 • committed by GitHub
parent 2876b80a7d
commit ee35a6c41a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 31 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

24
rmw_cyclonedds_cpp/include/rmw_cyclonedds_cpp/rmw_version_test.hpp Normal file
View file

@ -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_

6
rmw_cyclonedds_cpp/src/rmw_get_topic_endpoint_info.cpp
View file

@ -12,6 +12,10 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // 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/error_handling.h"
#include "rmw/get_topic_endpoint_info.h" #include "rmw/get_topic_endpoint_info.h"
#include "rmw/topic_endpoint_info_array.h" #include "rmw/topic_endpoint_info_array.h"
@ -40,3 +44,5 @@ rmw_get_subscriptions_info_by_topic(
return RMW_RET_UNSUPPORTED; return RMW_RET_UNSUPPORTED;
} }
} // extern "C" } // extern "C"
#endif

8
rmw_cyclonedds_cpp/src/rmw_node.cpp
View file

@ -46,6 +46,7 @@
#include "TypeSupport2.hpp" #include "TypeSupport2.hpp"
#include "rmw_cyclonedds_cpp/rmw_version_test.hpp"
#include "rmw_cyclonedds_cpp/MessageTypeSupport.hpp" #include "rmw_cyclonedds_cpp/MessageTypeSupport.hpp"
#include "rmw_cyclonedds_cpp/ServiceTypeSupport.hpp" #include "rmw_cyclonedds_cpp/ServiceTypeSupport.hpp"
@ -66,13 +67,6 @@
#define MULTIDOMAIN 0 #define MULTIDOMAIN 0
#endif #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 #if RMW_VERSION_GTE(0, 8, 1) && MULTIDOMAIN
#define SUPPORT_LOCALHOST 1 #define SUPPORT_LOCALHOST 1
#else #else