Unverified Commit 503d7d6e authored by Justin Carpentier's avatar Justin Carpentier Committed by GitHub
Browse files

Merge pull request #226 from nim65s/topic/warnings

Fix warnings
parents 31955816 080f9098
Pipeline #13855 passed with stage
in 14 minutes and 29 seconds
...@@ -192,12 +192,6 @@ ELSE() ...@@ -192,12 +192,6 @@ ELSE()
TARGET_COMPILE_OPTIONS(${PROJECT_NAME} PRIVATE $<$<CXX_COMPILER_ID:MSVC>:-bigobj>) TARGET_COMPILE_OPTIONS(${PROJECT_NAME} PRIVATE $<$<CXX_COMPILER_ID:MSVC>:-bigobj>)
ENDIF() ENDIF()
IF(Boost_VERSION GREATER 107299)
# Silence a warning about a deprecated use of boost bind by boost python
# at least fo boost 1.73 to 1.75
ADD_DEFINITIONS(-DBOOST_BIND_GLOBAL_PLACEHOLDERS)
ENDIF()
TARGET_LINK_BOOST_PYTHON(${PROJECT_NAME} PUBLIC) TARGET_LINK_BOOST_PYTHON(${PROJECT_NAME} PUBLIC)
INSTALL(TARGETS ${PROJECT_NAME} INSTALL(TARGETS ${PROJECT_NAME}
EXPORT ${TARGETS_EXPORT_NAME} EXPORT ${TARGETS_EXPORT_NAME}
......
...@@ -5,10 +5,7 @@ ...@@ -5,10 +5,7 @@
#ifndef __eigenpy_decompositions_computation_info_hpp__ #ifndef __eigenpy_decompositions_computation_info_hpp__
#define __eigenpy_decompositions_computation_info_hpp__ #define __eigenpy_decompositions_computation_info_hpp__
#include <Eigen/Core> #include "eigenpy/fwd.hpp"
#include <boost/python.hpp>
#include "eigenpy/config.hpp"
namespace eigenpy namespace eigenpy
{ {
......
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
#include "eigenpy/fwd.hpp" #include "eigenpy/fwd.hpp"
#include "eigenpy/deprecated.hpp" #include "eigenpy/deprecated.hpp"
#include "eigenpy/config.hpp"
#include "eigenpy/eigen-typedef.hpp" #include "eigenpy/eigen-typedef.hpp"
#define ENABLE_SPECIFIC_MATRIX_TYPE(TYPE) \ #define ENABLE_SPECIFIC_MATRIX_TYPE(TYPE) \
......
...@@ -3,12 +3,13 @@ ...@@ -3,12 +3,13 @@
* Copyright 2018-2019, INRIA * Copyright 2018-2019, INRIA
*/ */
#include <boost/python.hpp> #ifndef __eigenpy_exception_hpp__
#define __eigenpy_exception_hpp__
#include <exception> #include <exception>
#include <string> #include <string>
#ifndef __eigenpy_exception_hpp__ #include "eigenpy/fwd.hpp"
#define __eigenpy_exception_hpp__
namespace eigenpy namespace eigenpy
{ {
......
...@@ -7,13 +7,21 @@ ...@@ -7,13 +7,21 @@
#include "eigenpy/config.hpp" #include "eigenpy/config.hpp"
// Silence a warning about a deprecated use of boost bind by boost python
// at least fo boost 1.73 to 1.75
// ref. https://github.com/stack-of-tasks/tsid/issues/128
#define BOOST_BIND_GLOBAL_PLACEHOLDERS
#include <boost/python.hpp> #include <boost/python.hpp>
#include <Eigen/Core> #include <boost/python/scope.hpp>
#define NO_IMPORT_ARRAY #define NO_IMPORT_ARRAY
#include "eigenpy/numpy.hpp" #include "eigenpy/numpy.hpp"
#undef NO_IMPORT_ARRAY #undef NO_IMPORT_ARRAY
#undef BOOST_BIND_GLOBAL_PLACEHOLDERS
#include <Eigen/Core>
#if EIGEN_VERSION_AT_LEAST(3,2,90) #if EIGEN_VERSION_AT_LEAST(3,2,90)
#define EIGENPY_DEFAULT_ALIGNMENT_VALUE Eigen::Aligned16 #define EIGENPY_DEFAULT_ALIGNMENT_VALUE Eigen::Aligned16
#else #else
......
...@@ -6,9 +6,8 @@ ...@@ -6,9 +6,8 @@
#ifndef __eigenpy_geometry_conversion_hpp__ #ifndef __eigenpy_geometry_conversion_hpp__
#define __eigenpy_geometry_conversion_hpp__ #define __eigenpy_geometry_conversion_hpp__
#include <Eigen/Core> #include "eigenpy/fwd.hpp"
#include <Eigen/Geometry> #include <Eigen/Geometry>
#include <boost/python.hpp>
namespace eigenpy namespace eigenpy
{ {
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
#ifndef __eigenpy_memory_hpp__ #ifndef __eigenpy_memory_hpp__
#define __eigenpy_memory_hpp__ #define __eigenpy_memory_hpp__
#include <boost/python.hpp> #include "eigenpy/fwd.hpp"
/** /**
* This section contains a convenience MACRO which allows an easy specialization of * This section contains a convenience MACRO which allows an easy specialization of
......
...@@ -5,8 +5,7 @@ ...@@ -5,8 +5,7 @@
#ifndef __eigenpy_numpy_hpp__ #ifndef __eigenpy_numpy_hpp__
#define __eigenpy_numpy_hpp__ #define __eigenpy_numpy_hpp__
#include <boost/python.hpp> #include "eigenpy/fwd.hpp"
#include "eigenpy/config.hpp"
#ifndef PY_ARRAY_UNIQUE_SYMBOL #ifndef PY_ARRAY_UNIQUE_SYMBOL
#define PY_ARRAY_UNIQUE_SYMBOL EIGENPY_ARRAY_API #define PY_ARRAY_UNIQUE_SYMBOL EIGENPY_ARRAY_API
......
...@@ -6,8 +6,7 @@ ...@@ -6,8 +6,7 @@
#ifndef __eigenpy_registration_hpp__ #ifndef __eigenpy_registration_hpp__
#define __eigenpy_registration_hpp__ #define __eigenpy_registration_hpp__
#include <boost/python.hpp> #include "eigenpy/fwd.hpp"
#include <boost/python/scope.hpp>
namespace eigenpy namespace eigenpy
{ {
......
...@@ -17,8 +17,7 @@ ...@@ -17,8 +17,7 @@
#ifndef __eigenpy_bfgs_preconditioners_hpp__ #ifndef __eigenpy_bfgs_preconditioners_hpp__
#define __eigenpy_bfgs_preconditioners_hpp__ #define __eigenpy_bfgs_preconditioners_hpp__
#include <boost/python.hpp> #include "eigenpy/fwd.hpp"
#include <Eigen/Core>
#include <Eigen/IterativeLinearSolvers> #include <Eigen/IterativeLinearSolvers>
#include "eigenpy/solvers/BasicPreconditioners.hpp" #include "eigenpy/solvers/BasicPreconditioners.hpp"
......
...@@ -17,8 +17,7 @@ ...@@ -17,8 +17,7 @@
#ifndef __eigenpy_basic_preconditioners_hpp__ #ifndef __eigenpy_basic_preconditioners_hpp__
#define __eigenpy_basic_preconditioners_hpp__ #define __eigenpy_basic_preconditioners_hpp__
#include <boost/python.hpp> #include "eigenpy/fwd.hpp"
#include <Eigen/Core>
#include <Eigen/IterativeLinearSolvers> #include <Eigen/IterativeLinearSolvers>
namespace eigenpy namespace eigenpy
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
#ifndef __eigenpy_conjugate_gradient_hpp__ #ifndef __eigenpy_conjugate_gradient_hpp__
#define __eigenpy_conjugate_gradient_hpp__ #define __eigenpy_conjugate_gradient_hpp__
#include <boost/python.hpp> #include "eigenpy/fwd.hpp"
#include <Eigen/IterativeLinearSolvers> #include <Eigen/IterativeLinearSolvers>
#include "eigenpy/solvers/IterativeSolverBase.hpp" #include "eigenpy/solvers/IterativeSolverBase.hpp"
......
...@@ -17,9 +17,7 @@ ...@@ -17,9 +17,7 @@
#ifndef __eigenpy_iterative_solver_base_hpp__ #ifndef __eigenpy_iterative_solver_base_hpp__
#define __eigenpy_iterative_solver_base_hpp__ #define __eigenpy_iterative_solver_base_hpp__
#include <boost/python.hpp> #include "eigenpy/fwd.hpp"
#include <Eigen/Core>
#include "eigenpy/solvers/SparseSolverBase.hpp" #include "eigenpy/solvers/SparseSolverBase.hpp"
namespace eigenpy namespace eigenpy
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
#ifndef __eigenpy_least_square_conjugate_gradient_hpp__ #ifndef __eigenpy_least_square_conjugate_gradient_hpp__
#define __eigenpy_least_square_conjugate_gradient_hpp__ #define __eigenpy_least_square_conjugate_gradient_hpp__
#include <boost/python.hpp> #include "eigenpy/fwd.hpp"
#include <Eigen/IterativeLinearSolvers> #include <Eigen/IterativeLinearSolvers>
#include "eigenpy/solvers/IterativeSolverBase.hpp" #include "eigenpy/solvers/IterativeSolverBase.hpp"
......
...@@ -17,8 +17,7 @@ ...@@ -17,8 +17,7 @@
#ifndef __eigenpy_sparse_solver_base_hpp__ #ifndef __eigenpy_sparse_solver_base_hpp__
#define __eigenpy_sparse_solver_base_hpp__ #define __eigenpy_sparse_solver_base_hpp__
#include <boost/python.hpp> #include "eigenpy/fwd.hpp"
#include <Eigen/Core>
namespace eigenpy namespace eigenpy
{ {
......
...@@ -2,8 +2,7 @@ ...@@ -2,8 +2,7 @@
* Copyright 2020 INRIA * Copyright 2020 INRIA
*/ */
#include <boost/python.hpp> #include "eigenpy/fwd.hpp"
#include <Eigen/Core>
#include "eigenpy/decompositions/decompositions.hpp" #include "eigenpy/decompositions/decompositions.hpp"
......
...@@ -7,9 +7,9 @@ MACRO(ADD_LIB_UNIT_TEST test) ...@@ -7,9 +7,9 @@ MACRO(ADD_LIB_UNIT_TEST test)
CREATE_CTEST_BUILD_TESTS_TARGET() CREATE_CTEST_BUILD_TESTS_TARGET()
IF(BUILD_TESTING) IF(BUILD_TESTING)
ADD_LIBRARY(${test} SHARED ${test}) ADD_LIBRARY(${test} SHARED "${test}.cpp")
ELSE(BUILD_TESTING) ELSE(BUILD_TESTING)
ADD_LIBRARY(${test} SHARED EXCLUDE_FROM_ALL ${test}) ADD_LIBRARY(${test} SHARED EXCLUDE_FROM_ALL "${test}.cpp")
ENDIF(BUILD_TESTING) ENDIF(BUILD_TESTING)
TARGET_LINK_LIBRARIES(${test} PUBLIC ${PROJECT_NAME}) TARGET_LINK_LIBRARIES(${test} PUBLIC ${PROJECT_NAME})
......
/* Simple test using the boost::numpy interface: return an array and a matrix. */ /* Simple test using the boost::numpy interface: return an array and a matrix. */
#include <boost/python.hpp> #include "eigenpy/fwd.hpp"
#include "boost/numpy.hpp" #include "boost/numpy.hpp"
namespace bp = boost::python; namespace bp = boost::python;
......
#include <Eigen/Core> #include "eigenpy/fwd.hpp"
#include <boost/python.hpp>
#include <boost/numpy.hpp> #include <boost/numpy.hpp>
......
#include <Eigen/Core> #include "eigenpy/fwd.hpp"
#include <boost/python.hpp>
#include <numpy/arrayobject.h> #include <numpy/arrayobject.h>
namespace boopy namespace boopy
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment