fix missed mandatory -std=c++11 flag (#181)
collada_parser,kdl_parser,urdf: add c++11 flag, collada_parser: replace typeof with ansi __typeof__ builded/tested on gentoo Thanks den4ix for the contribution!
This commit is contained in:
parent
4d03177186
commit
3c7933b037
|
@ -6,6 +6,8 @@ find_package(Boost REQUIRED system)
|
||||||
find_package(catkin REQUIRED COMPONENTS urdf_parser_plugin roscpp class_loader urdf)
|
find_package(catkin REQUIRED COMPONENTS urdf_parser_plugin roscpp class_loader urdf)
|
||||||
find_package(urdfdom_headers REQUIRED)
|
find_package(urdfdom_headers REQUIRED)
|
||||||
|
|
||||||
|
add_compile_options(-std=c++11)
|
||||||
|
|
||||||
catkin_package(
|
catkin_package(
|
||||||
LIBRARIES ${PROJECT_NAME}
|
LIBRARIES ${PROJECT_NAME}
|
||||||
INCLUDE_DIRS include
|
INCLUDE_DIRS include
|
||||||
|
|
|
@ -42,8 +42,13 @@
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <sstream>
|
#include <sstream>
|
||||||
|
|
||||||
|
/* disable deprecated auto_ptr warnings */
|
||||||
|
#pragma GCC diagnostic push
|
||||||
|
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
|
||||||
#include <dae.h>
|
#include <dae.h>
|
||||||
#include <dae/daeErrorHandler.h>
|
#include <dae/daeErrorHandler.h>
|
||||||
|
#pragma GCC diagnostic pop
|
||||||
|
|
||||||
#include <dom/domCOLLADA.h>
|
#include <dom/domCOLLADA.h>
|
||||||
#include <dae/domAny.h>
|
#include <dae/domAny.h>
|
||||||
#include <dom/domConstants.h>
|
#include <dom/domConstants.h>
|
||||||
|
@ -67,6 +72,7 @@
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#define typeof __typeof__
|
||||||
#define FOREACH(it, v) for(typeof((v).begin())it = (v).begin(); it != (v).end(); (it)++)
|
#define FOREACH(it, v) for(typeof((v).begin())it = (v).begin(); it != (v).end(); (it)++)
|
||||||
#define FOREACHC FOREACH
|
#define FOREACHC FOREACH
|
||||||
|
|
||||||
|
|
|
@ -19,6 +19,8 @@ link_directories(${Boost_LIBRARY_DIRS})
|
||||||
|
|
||||||
find_library(KDL_LIBRARY REQUIRED NAMES orocos-kdl HINTS ${orocos_kdl_LIBRARY_DIRS})
|
find_library(KDL_LIBRARY REQUIRED NAMES orocos-kdl HINTS ${orocos_kdl_LIBRARY_DIRS})
|
||||||
|
|
||||||
|
add_compile_options(-std=c++11)
|
||||||
|
|
||||||
catkin_package(
|
catkin_package(
|
||||||
LIBRARIES ${PROJECT_NAME} ${KDL_LIBRARY}
|
LIBRARIES ${PROJECT_NAME} ${KDL_LIBRARY}
|
||||||
INCLUDE_DIRS include
|
INCLUDE_DIRS include
|
||||||
|
|
|
@ -21,6 +21,8 @@ set(generated_compat_header "${CATKIN_DEVEL_PREFIX}/include/${PROJECT_NAME}/urdf
|
||||||
include_directories("${CATKIN_DEVEL_PREFIX}/include")
|
include_directories("${CATKIN_DEVEL_PREFIX}/include")
|
||||||
configure_file(urdfdom_compatibility.h.in "${generated_compat_header}" @ONLY)
|
configure_file(urdfdom_compatibility.h.in "${generated_compat_header}" @ONLY)
|
||||||
|
|
||||||
|
add_compile_options(-std=c++11)
|
||||||
|
|
||||||
catkin_package(
|
catkin_package(
|
||||||
LIBRARIES ${PROJECT_NAME}
|
LIBRARIES ${PROJECT_NAME}
|
||||||
INCLUDE_DIRS include ${TinyXML_INLCLUDE_DIRS} ${CATKIN_DEVEL_PREFIX}/include
|
INCLUDE_DIRS include ${TinyXML_INLCLUDE_DIRS} ${CATKIN_DEVEL_PREFIX}/include
|
||||||
|
|
|
@ -94,7 +94,7 @@ protected:
|
||||||
double roll,pitch,yaw;
|
double roll,pitch,yaw;
|
||||||
(*child)->parent_joint->parent_to_joint_origin_transform.rotation.getRPY(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!");
|
ROS_ERROR("getRPY() returned nan!");
|
||||||
return false;
|
return false;
|
||||||
|
|
Loading…
Reference in New Issue