Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove enforcement of C++14 standard #370

Open
wants to merge 4 commits into
base: develop
Choose a base branch
from
+16 −21
Open

Remove enforcement of C++14 standard #370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cc26835
Remove reference to non-existing plugin file
rhaschke Jun 20, 2024
dea9b98
Remove enforcement of C++14 standard
rhaschke Sep 12, 2023
f167306
Explicitly declare boost::placeholders usage
rhaschke Sep 13, 2023
ba8dd20
Replace generic using namespace -> boost::placeholders::*
rhaschke Sep 13, 2023
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
3 changes: 0 additions & 3 deletions franka_control/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
cmake_minimum_required(VERSION 3.4)
project(franka_control)

set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_STANDARD_REQUIRED ON)

find_package(catkin REQUIRED COMPONENTS
controller_interface
controller_manager
Expand Down
2 changes: 0 additions & 2 deletions franka_example_controllers/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ cmake_minimum_required(VERSION 3.4)
project(franka_example_controllers)

set(CMAKE_BUILD_TYPE Release)
set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_STANDARD_REQUIRED ON)

find_package(catkin REQUIRED COMPONENTS
controller_interface
Expand Down
3 changes: 3 additions & 0 deletions franka_example_controllers/src/cartesian_impedance_example_controller.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
#include <pluginlib/class_list_macros.h>
#include <ros/ros.h>

using boost::placeholders::_1;
using boost::placeholders::_2;

#include <franka_example_controllers/pseudo_inversion.h>

namespace franka_example_controllers {
Expand Down
3 changes: 3 additions & 0 deletions franka_example_controllers/src/dual_arm_cartesian_impedance_example_controller.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@
#include <tf/transform_listener.h>
#include <tf_conversions/tf_eigen.h>

using boost::placeholders::_1;
using boost::placeholders::_2;

namespace franka_example_controllers {

bool DualArmCartesianImpedanceExampleController::initArm(
Expand Down
3 changes: 3 additions & 0 deletions franka_example_controllers/src/force_example_controller.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@

#include <franka/robot_state.h>

using boost::placeholders::_1;
using boost::placeholders::_2;

namespace franka_example_controllers {

bool ForceExampleController::init(hardware_interface::RobotHW* robot_hw,
Expand Down
3 changes: 3 additions & 0 deletions franka_example_controllers/src/teleop_gripper_node.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@
#include <memory>
#include <mutex>

using boost::placeholders::_1;
using boost::placeholders::_2;

using franka_gripper::GraspAction;
using franka_gripper::HomingAction;
using franka_gripper::MoveAction;
Expand Down
2 changes: 2 additions & 0 deletions franka_example_controllers/src/teleop_joint_pd_example_controller.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
#include <vector>

using Vector7d = Eigen::Matrix<double, 7, 1>;
using boost::placeholders::_1;
using boost::placeholders::_2;

const std::string kControllerName = "TeleopJointPDExampleController";

Expand Down
3 changes: 0 additions & 3 deletions franka_gazebo/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@ if(${ARCHITECTURE} STREQUAL "armv7l")
endif()


set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_STANDARD_REQUIRED ON)

# Load catkin and all dependencies required for this package
find_package(catkin REQUIRED COMPONENTS
gazebo_dev
Expand Down
2 changes: 2 additions & 0 deletions franka_gazebo/src/franka_gripper_sim.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
#include <franka_gazebo/franka_gripper_sim.h>
#include <pluginlib/class_list_macros.h>

using boost::placeholders::_1;

namespace franka_gazebo {

using actionlib::SimpleActionServer;
Expand Down
3 changes: 0 additions & 3 deletions franka_gripper/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
cmake_minimum_required(VERSION 3.4)
project(franka_gripper)

set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_STANDARD_REQUIRED ON)

find_package(catkin REQUIRED COMPONENTS
roscpp
message_generation
Expand Down
3 changes: 0 additions & 3 deletions franka_hw/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
cmake_minimum_required(VERSION 3.4)
project(franka_hw)

set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_STANDARD_REQUIRED ON)

find_package(catkin REQUIRED COMPONENTS
actionlib
controller_interface
Expand Down
4 changes: 0 additions & 4 deletions franka_hw/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,4 @@
<test_depend>franka_description</test_depend>
<test_depend>gtest</test_depend>
<test_depend>rostest</test_depend>

<export>
<hardware_interface plugin="${prefix}/franka_combinable_hw_plugin.xml"/>
</export>
</package>
3 changes: 0 additions & 3 deletions franka_visualization/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
cmake_minimum_required(VERSION 3.4)
project(franka_visualization)

set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_STANDARD_REQUIRED ON)

find_package(catkin REQUIRED COMPONENTS
sensor_msgs
roscpp
Expand Down
Loading