Merge pull request #129 from Pandhariix/melodic_compatibility

Melodic compatibility
ros-naoqi · Jan 8, 2020 · d528305 · d528305
2 parents 1758a83 + 6a09f9c
commit d528305
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 6 deletions.
diff --git a/CMakeLists_catkin.txt b/CMakeLists_catkin.txt
@@ -29,10 +29,6 @@ add_definitions(-DLIBQI_VERSION=${naoqi_libqi_VERSION_MAJOR}${naoqi_libqi_VERSIO
 
 catkin_package(LIBRARIES naoqi_driver_module naoqi_driver)
 
-if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=deprecated-declarations")
-endif()
-
 include_directories( include ${catkin_INCLUDE_DIRS})
 
 # create the different libraries

diff --git a/src/converters/joint_state.cpp b/src/converters/joint_state.cpp
@@ -70,7 +70,7 @@ void JointStateConverter::reset()
 
   // set mimic joint list
   mimic_.clear();
-  for(std::map< std::string, boost::shared_ptr< urdf::Joint > >::iterator i = model.joints_.begin(); i != model.joints_.end(); i++){
+  for(std::map< std::string, urdf::JointSharedPtr >::iterator i = model.joints_.begin(); i != model.joints_.end(); i++){
     if(i->second->mimic){
       mimic_.insert(make_pair(i->first, i->second->mimic));
     }

diff --git a/src/converters/joint_state.hpp b/src/converters/joint_state.hpp
@@ -45,7 +45,7 @@ class JointStateConverter : public BaseConverter<JointStateConverter>
 
   typedef boost::shared_ptr<tf2_ros::Buffer> BufferPtr;
 
-  typedef std::map<std::string, boost::shared_ptr<urdf::JointMimic> > MimicMap;
+  typedef std::map<std::string, urdf::JointMimicSharedPtr> MimicMap;
 
 public:
   JointStateConverter( const std::string& name, const float& frequency, const BufferPtr& tf2_buffer, const qi::SessionPtr& session );

diff --git a/src/helpers/filesystem_helpers.hpp b/src/helpers/filesystem_helpers.hpp
@@ -19,6 +19,7 @@
 #ifndef FILESYSTEM_HELPERS_HPP
 #define FILESYSTEM_HELPERS_HPP
 
+#include <iostream>
 #include <qi/session.hpp>
 
 #include <boost/filesystem.hpp>

diff --git a/src/tools/from_any_value.hpp b/src/tools/from_any_value.hpp
@@ -18,6 +18,8 @@
 #ifndef FROM_ANY_VALUE_HPP
 #define FROM_ANY_VALUE_HPP
 
+#include <iostream>
+
 /*
 * LOCAL includes
 */