Skip to content
This repository has been archived by the owner on Aug 3, 2020. It is now read-only.

fix missed mandatory -std=c++11 flag #181

Merged
merged 1 commit into from
Feb 3, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions collada_parser/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ find_package(Boost REQUIRED system)
find_package(catkin REQUIRED COMPONENTS urdf_parser_plugin roscpp class_loader urdf)
find_package(urdfdom_headers REQUIRED)

add_compile_options(-std=c++11)

catkin_package(
LIBRARIES ${PROJECT_NAME}
INCLUDE_DIRS include
Expand Down
6 changes: 6 additions & 0 deletions collada_parser/src/collada_parser.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,13 @@
#include <string>
#include <sstream>

/* disable deprecated auto_ptr warnings */
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#include <dae.h>
#include <dae/daeErrorHandler.h>
#pragma GCC diagnostic pop

#include <dom/domCOLLADA.h>
#include <dae/domAny.h>
#include <dom/domConstants.h>
Expand All @@ -67,6 +72,7 @@
#include <fcntl.h>
#endif

#define typeof __typeof__
#define FOREACH(it, v) for(typeof((v).begin())it = (v).begin(); it != (v).end(); (it)++)
#define FOREACHC FOREACH

Expand Down
2 changes: 2 additions & 0 deletions kdl_parser/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ link_directories(${Boost_LIBRARY_DIRS})

find_library(KDL_LIBRARY REQUIRED NAMES orocos-kdl HINTS ${orocos_kdl_LIBRARY_DIRS})

add_compile_options(-std=c++11)

catkin_package(
LIBRARIES ${PROJECT_NAME} ${KDL_LIBRARY}
INCLUDE_DIRS include
Expand Down
2 changes: 2 additions & 0 deletions urdf/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ set(generated_compat_header "${CATKIN_DEVEL_PREFIX}/include/${PROJECT_NAME}/urdf
include_directories("${CATKIN_DEVEL_PREFIX}/include")
configure_file(urdfdom_compatibility.h.in "${generated_compat_header}" @ONLY)

add_compile_options(-std=c++11)

catkin_package(
LIBRARIES ${PROJECT_NAME}
INCLUDE_DIRS include ${TinyXML_INLCLUDE_DIRS} ${CATKIN_DEVEL_PREFIX}/include
Expand Down
2 changes: 1 addition & 1 deletion urdf/test/test_robot_model_parser.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ class TestParser : public testing::Test
double roll,pitch,yaw;
(*child)->parent_joint->parent_to_joint_origin_transform.rotation.getRPY(roll,pitch,yaw);

if (isnan(roll) || isnan(pitch) || isnan(yaw))
if (std::isnan(roll) || std::isnan(pitch) || std::isnan(yaw))
{
ROS_ERROR("getRPY() returned nan!");
return false;
Expand Down