From 10bcbd62d5d13c04ab08faa746afbc4375fc461d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Jourdes?= Date: Thu, 5 Oct 2017 15:10:25 +0200 Subject: [PATCH 1/2] FIX: Warnings introduced when using msvc compiler by 4548ab474f89a229f since the pragma compiler directive only work for gcc (and maybe clang) --- SofaKernel/extlibs/eigen-3.2.7/Eigen/src/Core/Functors.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/SofaKernel/extlibs/eigen-3.2.7/Eigen/src/Core/Functors.h b/SofaKernel/extlibs/eigen-3.2.7/Eigen/src/Core/Functors.h index 4ceb07ae7a5..59066f50e5f 100644 --- a/SofaKernel/extlibs/eigen-3.2.7/Eigen/src/Core/Functors.h +++ b/SofaKernel/extlibs/eigen-3.2.7/Eigen/src/Core/Functors.h @@ -10,9 +10,10 @@ #ifndef EIGEN_FUNCTORS_H #define EIGEN_FUNCTORS_H +#ifndef WIN32 #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" // deprecated std::binder1st and std::binder2nd - +#endif // WIN32 namespace Eigen { @@ -1028,6 +1029,8 @@ struct functor_traits > } // end namespace Eigen +#ifndef WIN32 #pragma GCC diagnostic pop +#endif // WIN32 #endif // EIGEN_FUNCTORS_H From dd611531bbc15115ef140db790acfb18fd23f86e Mon Sep 17 00:00:00 2001 From: Francois Jourdes Date: Thu, 5 Oct 2017 19:08:07 +0200 Subject: [PATCH 2/2] UPDATE: Testing for GNUC compiler seems a better option. --- SofaKernel/extlibs/eigen-3.2.7/Eigen/src/Core/Functors.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/SofaKernel/extlibs/eigen-3.2.7/Eigen/src/Core/Functors.h b/SofaKernel/extlibs/eigen-3.2.7/Eigen/src/Core/Functors.h index 59066f50e5f..5b1805bcd2d 100644 --- a/SofaKernel/extlibs/eigen-3.2.7/Eigen/src/Core/Functors.h +++ b/SofaKernel/extlibs/eigen-3.2.7/Eigen/src/Core/Functors.h @@ -10,10 +10,10 @@ #ifndef EIGEN_FUNCTORS_H #define EIGEN_FUNCTORS_H -#ifndef WIN32 +#ifdef GNUC #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" // deprecated std::binder1st and std::binder2nd -#endif // WIN32 +#endif // GNUC namespace Eigen { @@ -1029,8 +1029,8 @@ struct functor_traits > } // end namespace Eigen -#ifndef WIN32 +#ifdef GNUC #pragma GCC diagnostic pop -#endif // WIN32 +#endif // GNUC #endif // EIGEN_FUNCTORS_H