Merge pull request #114 from jspricke/cleanup

Cleanup for new Ubuntu version

Author: Simon Schmeisser

CMakeLists.txt

@@ -1,9 +1,6 @@
 cmake_minimum_required(VERSION 3.0.2)
 project(moveit_visual_tools)
 
-# C++ 11 required for OMPL
-add_compile_options(-std=c++11)
-
 # Load catkin and all dependencies required for this package
 find_package(catkin REQUIRED COMPONENTS
   rviz_visual_tools

src/imarker_end_effector.cpp

@@ -200,7 +200,8 @@ void IMarkerEndEffector::solveIK(Eigen::Isometry3d& pose)
     boost::scoped_ptr<planning_scene_monitor::LockedPlanningSceneRO> ls;
     ls.reset(new planning_scene_monitor::LockedPlanningSceneRO(psm_));
     constraint_fn = boost::bind(&isStateValid, static_cast<const planning_scene::PlanningSceneConstPtr&>(*ls).get(),
-                                collision_checking_verbose_, only_check_self_collision_, visual_tools_, _1, _2, _3);
+                                collision_checking_verbose_, only_check_self_collision_, visual_tools_,
+                                boost::placeholders::_1, boost::placeholders::_2, boost::placeholders::_3);
   }
 
   // Attempt to set robot to new pose
@@ -297,7 +298,8 @@ void IMarkerEndEffector::make6DofMarker(const geometry_msgs::Pose& pose)
   int_marker_.controls.push_back(control);
 
   imarker_server_->insert(int_marker_);
-  imarker_server_->setCallback(int_marker_.name, boost::bind(&IMarkerEndEffector::iMarkerCallback, this, _1));
+  imarker_server_->setCallback(int_marker_.name,
+                               boost::bind(&IMarkerEndEffector::iMarkerCallback, this, boost::placeholders::_1));
   // menu_handler_.apply(*imarker_server_, int_marker_.name);
 }
 

src/imarker_robot_state.cpp

@@ -355,7 +355,8 @@ bool IMarkerRobotState::setFromPoses(const EigenSTL::vector_Isometry3d& poses,
   boost::scoped_ptr<planning_scene_monitor::LockedPlanningSceneRO> ls;
   ls.reset(new planning_scene_monitor::LockedPlanningSceneRO(psm_));
   constraint_fn = boost::bind(&isIKStateValid, static_cast<const planning_scene::PlanningSceneConstPtr&>(*ls).get(),
-                              collision_checking_verbose_, only_check_self_collision_, visual_tools_, _1, _2, _3);
+                              collision_checking_verbose_, only_check_self_collision_, visual_tools_,
+                              boost::placeholders::_1, boost::placeholders::_2, boost::placeholders::_3);
 #endif
 
   // Solve