Skip to content

Commit

Permalink
Merge pull request #249 from robotology/solveidyntreedeprecations
Browse files Browse the repository at this point in the history
Remove warnings from configuration and compilation
  • Loading branch information
traversaro authored Dec 6, 2024
2 parents 498f488 + d602ad7 commit 6f52ead
Show file tree
Hide file tree
Showing 17 changed files with 51 additions and 51 deletions.
4 changes: 2 additions & 2 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ Example:
#include "RobotInterface.h"
#include "Signal.h"

#include <iDynTree/Core/EigenHelpers.h>
#include <iDynTree/Core/SpatialMomentum.h>
#include <iDynTree/EigenHelpers.h>
#include <iDynTree/SpatialMomentum.h>
#include <iDynTree/KinDynComputations.h>

#include <ostream>
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# This software may be modified and distributed under the terms of the
# GNU Lesser General Public License v2.1 or any later version.

cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.16)
project(WB-Toolbox LANGUAGES CXX VERSION 6.0.0)

if(WBT_BUILD_DOCS)
Expand Down
2 changes: 1 addition & 1 deletion toolbox/base/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ target_link_libraries(WBToolboxBase
YARP::YARP_init
YARP::YARP_dev
iDynTree::idyntree-model
iDynTree::idyntree-modelio-urdf
iDynTree::idyntree-modelio
iDynTree::idyntree-high-level)

target_include_directories(WBToolboxBase PUBLIC
Expand Down
8 changes: 4 additions & 4 deletions toolbox/base/src/RobotInterface.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@

#include <BlockFactory/Core/Log.h>
#include <iDynTree/KinDynComputations.h>
#include <iDynTree/Model/FreeFloatingMatrices.h>
#include <iDynTree/Model/Indices.h>
#include <iDynTree/Model/Model.h>
#include <iDynTree/ModelIO/ModelLoader.h>
#include <iDynTree/FreeFloatingMatrices.h>
#include <iDynTree/Indices.h>
#include <iDynTree/Model.h>
#include <iDynTree/ModelLoader.h>
#include <yarp/dev/ControlBoardInterfaces.h>
#include <yarp/dev/PolyDriver.h>
#include <yarp/os/Bottle.h>
Expand Down
10 changes: 5 additions & 5 deletions toolbox/base/src/WBBlock.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
#include <BlockFactory/Core/Parameter.h>
#include <BlockFactory/Core/Signal.h>
#include <Eigen/Core>
#include <iDynTree/Core/EigenHelpers.h>
#include <iDynTree/Core/Transform.h>
#include <iDynTree/Core/Twist.h>
#include <iDynTree/Core/VectorDynSize.h>
#include <iDynTree/Core/VectorFixSize.h>
#include <iDynTree/EigenHelpers.h>
#include <iDynTree/Transform.h>
#include <iDynTree/Twist.h>
#include <iDynTree/VectorDynSize.h>
#include <iDynTree/VectorFixSize.h>
#include <iDynTree/KinDynComputations.h>

#include <array>
Expand Down
2 changes: 1 addition & 1 deletion toolbox/library/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ list(APPEND WBTOOLBOXLIBRARY_EXT_LIBRARIES
YARP::YARP_math
iDynTree::idyntree-core
iDynTree::idyntree-model
iDynTree::idyntree-modelio-urdf
iDynTree::idyntree-modelio
iDynTree::idyntree-high-level)

# Additional dependency of the SimulatorSynchronizer block
Expand Down
4 changes: 2 additions & 2 deletions toolbox/library/src/CentroidalMomentum.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
#include <BlockFactory/Core/BlockInformation.h>
#include <BlockFactory/Core/Log.h>
#include <BlockFactory/Core/Signal.h>
#include <iDynTree/Core/EigenHelpers.h>
#include <iDynTree/Core/SpatialMomentum.h>
#include <iDynTree/EigenHelpers.h>
#include <iDynTree/SpatialMomentum.h>
#include <iDynTree/KinDynComputations.h>

#include <ostream>
Expand Down
8 changes: 4 additions & 4 deletions toolbox/library/src/CentroidalTotalMomentumMatrix.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
#include <BlockFactory/Core/Parameters.h>
#include <BlockFactory/Core/Signal.h>
#include <Eigen/Core>
#include <iDynTree/Core/EigenHelpers.h>
#include <iDynTree/Core/MatrixDynSize.h>
#include <iDynTree/Core/Transform.h>
#include <iDynTree/EigenHelpers.h>
#include <iDynTree/MatrixDynSize.h>
#include <iDynTree/Transform.h>
#include <iDynTree/KinDynComputations.h>
#include <iDynTree/Model/Indices.h>
#include <iDynTree/Indices.h>

#include <memory>
#include <ostream>
Expand Down
6 changes: 3 additions & 3 deletions toolbox/library/src/DotJNu.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
#include <BlockFactory/Core/Parameter.h>
#include <BlockFactory/Core/Parameters.h>
#include <BlockFactory/Core/Signal.h>
#include <iDynTree/Core/EigenHelpers.h>
#include <iDynTree/Core/VectorFixSize.h>
#include <iDynTree/EigenHelpers.h>
#include <iDynTree/VectorFixSize.h>
#include <iDynTree/KinDynComputations.h>
#include <iDynTree/Model/Indices.h>
#include <iDynTree/Indices.h>

#include <memory>
#include <ostream>
Expand Down
6 changes: 3 additions & 3 deletions toolbox/library/src/ForwardKinematics.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
#include <BlockFactory/Core/Parameters.h>
#include <BlockFactory/Core/Signal.h>
#include <Eigen/Core>
#include <iDynTree/Core/EigenHelpers.h>
#include <iDynTree/Core/Transform.h>
#include <iDynTree/EigenHelpers.h>
#include <iDynTree/Transform.h>
#include <iDynTree/KinDynComputations.h>
#include <iDynTree/Model/Indices.h>
#include <iDynTree/Indices.h>

#include <ostream>
#include <tuple>
Expand Down
6 changes: 3 additions & 3 deletions toolbox/library/src/GetLimits.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
#include <BlockFactory/Core/Parameters.h>
#include <BlockFactory/Core/Signal.h>
#include <iDynTree/KinDynComputations.h>
#include <iDynTree/Model/IJoint.h>
#include <iDynTree/Model/Indices.h>
#include <iDynTree/Model/Model.h>
#include <iDynTree/IJoint.h>
#include <iDynTree/Indices.h>
#include <iDynTree/Model.h>
#include <yarp/dev/ControlBoardInterfaces.h>

#include <cmath>
Expand Down
14 changes: 7 additions & 7 deletions toolbox/library/src/InverseDynamics.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@
#include <BlockFactory/Core/Log.h>
#include <BlockFactory/Core/Signal.h>
#include <Eigen/Core>
#include <iDynTree/Core/EigenHelpers.h>
#include <iDynTree/Core/VectorDynSize.h>
#include <iDynTree/Core/VectorFixSize.h>
#include <iDynTree/Core/Wrench.h>
#include <iDynTree/EigenHelpers.h>
#include <iDynTree/VectorDynSize.h>
#include <iDynTree/VectorFixSize.h>
#include <iDynTree/Wrench.h>
#include <iDynTree/KinDynComputations.h>
#include <iDynTree/Model/FreeFloatingState.h>
#include <iDynTree/Model/JointState.h>
#include <iDynTree/Model/LinkState.h>
#include <iDynTree/FreeFloatingState.h>
#include <iDynTree/JointState.h>
#include <iDynTree/LinkState.h>

#include <memory>
#include <ostream>
Expand Down
4 changes: 2 additions & 2 deletions toolbox/library/src/InverseKinematics.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
#include <Eigen/Core>
#include <iCub/iKin/iKinFwd.h>
#include <iCub/iKin/iKinIpOpt.h>
#include <iDynTree/Model/DenavitHartenberg.h>
#include <iDynTree/ModelIO/ModelLoader.h>
#include <iDynTree/DenavitHartenberg.h>
#include <iDynTree/ModelLoader.h>
#include <iDynTree/iKinConversions.h>
#include <wbi/wholeBodyInterface.h>
#include <yarp/os/ResourceFinder.h>
Expand Down
8 changes: 4 additions & 4 deletions toolbox/library/src/Jacobian.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
#include <BlockFactory/Core/Parameters.h>
#include <BlockFactory/Core/Signal.h>
#include <Eigen/Core>
#include <iDynTree/Core/EigenHelpers.h>
#include <iDynTree/Core/MatrixDynSize.h>
#include <iDynTree/Core/Transform.h>
#include <iDynTree/EigenHelpers.h>
#include <iDynTree/MatrixDynSize.h>
#include <iDynTree/Transform.h>
#include <iDynTree/KinDynComputations.h>
#include <iDynTree/Model/Indices.h>
#include <iDynTree/Indices.h>

#include <memory>
#include <ostream>
Expand Down
4 changes: 2 additions & 2 deletions toolbox/library/src/MassMatrix.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
#include <BlockFactory/Core/Log.h>
#include <BlockFactory/Core/Signal.h>
#include <Eigen/Core>
#include <iDynTree/Core/EigenHelpers.h>
#include <iDynTree/Core/MatrixDynSize.h>
#include <iDynTree/EigenHelpers.h>
#include <iDynTree/MatrixDynSize.h>
#include <iDynTree/KinDynComputations.h>

#include <ostream>
Expand Down
8 changes: 4 additions & 4 deletions toolbox/library/src/RelativeJacobian.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
#include <BlockFactory/Core/Parameters.h>
#include <BlockFactory/Core/Signal.h>
#include <Eigen/Core>
#include <iDynTree/Core/EigenHelpers.h>
#include <iDynTree/Core/MatrixDynSize.h>
#include <iDynTree/Core/Transform.h>
#include <iDynTree/EigenHelpers.h>
#include <iDynTree/MatrixDynSize.h>
#include <iDynTree/Transform.h>
#include <iDynTree/KinDynComputations.h>
#include <iDynTree/Model/Indices.h>
#include <iDynTree/Indices.h>

#include <memory>
#include <ostream>
Expand Down
6 changes: 3 additions & 3 deletions toolbox/library/src/RelativeTransform.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
#include <BlockFactory/Core/Parameters.h>
#include <BlockFactory/Core/Signal.h>
#include <Eigen/Core>
#include <iDynTree/Core/EigenHelpers.h>
#include <iDynTree/Core/Transform.h>
#include <iDynTree/EigenHelpers.h>
#include <iDynTree/Transform.h>
#include <iDynTree/KinDynComputations.h>
#include <iDynTree/Model/Indices.h>
#include <iDynTree/Indices.h>

#include <ostream>

Expand Down

0 comments on commit 6f52ead

Please sign in to comment.