Merge pull request #149 from ros2/suppress_deprecated_declaration_war…

…nings suppress deprecated declaration warning for Connext code
ros2 · Apr 7, 2016 · b8c4e3f · b8c4e3f
2 parents 6f1113f + 68e93ef
commit b8c4e3f
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 0 deletions.
diff --git a/rmw_connext_cpp/src/functions.cpp b/rmw_connext_cpp/src/functions.cpp
@@ -25,6 +25,7 @@
 
 #ifndef _WIN32
 # pragma GCC diagnostic push
+# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 # pragma GCC diagnostic ignored "-Wunused-parameter"
 # ifdef __clang__
 #  pragma clang diagnostic ignored "-Wdeprecated-register"

diff --git a/rmw_connext_dynamic_cpp/src/functions.cpp b/rmw_connext_dynamic_cpp/src/functions.cpp
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#define _GLIBCXX_USE_CXX11_ABI 0
+
 #include <cassert>
 #include <exception>
 #include <iostream>
@@ -26,6 +28,7 @@
 
 #ifndef _WIN32
 # pragma GCC diagnostic push
+# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 # pragma GCC diagnostic ignored "-Wunused-parameter"
 # ifdef __clang__
 #  pragma clang diagnostic ignored "-Wdeprecated-register"

diff --git a/rmw_connext_shared_cpp/include/rmw_connext_shared_cpp/shared_functions.hpp b/rmw_connext_shared_cpp/include/rmw_connext_shared_cpp/shared_functions.hpp
@@ -25,6 +25,7 @@
 
 #ifndef _WIN32
 # pragma GCC diagnostic push
+# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 # pragma GCC diagnostic ignored "-Wunused-parameter"
 # ifdef __clang__
 #  pragma clang diagnostic ignored "-Wdeprecated-register"

diff --git a/rosidl_typesupport_connext_c/resource/srv__type_support_c.cpp.template b/rosidl_typesupport_connext_c/resource/srv__type_support_c.cpp.template
@@ -12,6 +12,7 @@
 @
 #ifndef _WIN32
 # pragma GCC diagnostic push
+# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 # pragma GCC diagnostic ignored "-Wunused-parameter"
 # ifdef __clang__
 #  pragma clang diagnostic ignored "-Wdeprecated-register"

diff --git a/...dl_typesupport_connext_cpp/cmake/rosidl_typesupport_connext_cpp_generate_interfaces.cmake b/...dl_typesupport_connext_cpp/cmake/rosidl_typesupport_connext_cpp_generate_interfaces.cmake
@@ -83,6 +83,7 @@ if(NOT WIN32)
     )
   elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
     set(_connext_compile_flags
+      "-Wno-deprecated-declarations"
       "-Wno-strict-aliasing"
       "-Wno-unused-but-set-variable"
       "-Wno-unused-parameter"

diff --git a/rosidl_typesupport_connext_cpp/resource/srv__type_support.cpp.template b/rosidl_typesupport_connext_cpp/resource/srv__type_support.cpp.template
@@ -10,8 +10,10 @@
 @#  - get_header_filename_from_msg_name (function)
 @#######################################################################
 @
+#define _GLIBCXX_USE_CXX11_ABI 0
 #ifndef _WIN32
 # pragma GCC diagnostic push
+# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 # pragma GCC diagnostic ignored "-Wunused-parameter"
 # ifdef __clang__
 #  pragma clang diagnostic ignored "-Wdeprecated-register"