Suppress more warnings from Eigen and Boost

source/MRMesh/MRAligningTransform.cpp

@@ -3,8 +3,8 @@
 #include "MRAffineXf3.h"
 #include "MRQuaternion.h"
 #include "MRToFromEigen.h"
-#include <Eigen/Eigenvalues>
 #include "MRGTest.h"
+#include <Eigen/Eigenvalues>
 
 namespace MR
 {

source/MRMesh/MRAligningTransform.h

@@ -1,31 +1,8 @@
 #pragma once
+
 #include "MRMeshFwd.h"
 #include "MRAffineXf3.h"
-
-#pragma warning(push)
-#pragma warning(disable: 4068) // unknown pragmas
-#pragma warning(disable: 5054) // operator '|': deprecated between enumerations of different types
-
-#if defined(__clang__)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-anon-enum-enum-conversion"
-#elif defined(__GNUC__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
-#if __GNUC__ == 12
-#pragma GCC diagnostic ignored "-Warray-bounds"
-#endif
-#endif
-
-#include <Eigen/Core>
-
-#if defined(__clang__)
-#pragma clang diagnostic pop
-#elif defined(__GNUC__)
-#pragma GCC diagnostic pop
-#endif
-
-#pragma warning(pop)
+#include <MRPch/MREigenCore.h>
 
 namespace MR
 {

source/MRMesh/MRBestFit.cpp

@@ -6,12 +6,16 @@
 #include "MRGTest.h"
 #include <cassert>
 
-// unknown pragmas
-#pragma warning(disable:4068)
+#pragma warning(push)
+#pragma warning(disable:4068) // unknown pragma 'clang'
+#pragma warning(disable:4127)  //conditional expression is constant
+#pragma warning(disable:4464) // relative include path contains '..'
+#pragma warning(disable:5054)  //operator '&': deprecated between enumerations of different types
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-anon-enum-enum-conversion"
 #include <Eigen/Eigenvalues>
 #pragma clang diagnostic pop
+#pragma warning(pop)
 
 namespace MR
 {

source/MRMesh/MRLaplacian.cpp

@@ -7,7 +7,6 @@
 #include "MRMeshComponents.h"
 #include "MRGTest.h"
 #include "MRPch/MRTBB.h"
-
 #include <Eigen/SparseCholesky>
 
 namespace MR

source/MRMesh/MRLaplacian.h

@@ -6,6 +6,8 @@
 
 #pragma warning(push)
 #pragma warning(disable: 4068) // unknown pragmas
+#pragma warning(disable: 4127) // conditional expression is constant
+#pragma warning(disable: 4464) // relative include path contains '..'
 #pragma warning(disable: 5054) // operator '|': deprecated between enumerations of different types
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-anon-enum-enum-conversion"

source/MRMesh/MRMeshEigen.h

@@ -1,30 +1,7 @@
 #pragma once
 
 #include "MRMeshFwd.h"
-
-#pragma warning(push)
-#pragma warning(disable: 4068) // unknown pragmas
-#pragma warning(disable: 4127) // conditional expression is constant
-#pragma warning(disable: 4464) // relative include path contains '..'
-#pragma warning(disable: 4643) // Forward declaring 'tuple' in namespace std is not permitted by the C++ Standard.
-#pragma warning(disable: 5054) // operator '|': deprecated between enumerations of different types
-
-#if defined(__clang__)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-anon-enum-enum-conversion"
-#elif defined(__GNUC__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
-#endif
-#include <Eigen/Core>
-#if defined(__clang__)
-#pragma clang diagnostic pop
-#elif defined(__GNUC__)
-#pragma GCC diagnostic pop
-#endif
-
-
-#pragma warning(pop)
+#include <MRPch/MREigenCore.h>
 
 namespace MR
 {

source/MRMesh/MRSignal.h

@@ -1,6 +1,9 @@
 #pragma once
 
+#pragma warning(push)
+#pragma warning(disable: 4619) //#pragma warning: there is no warning number
 #include <boost/signals2/signal.hpp>
+#pragma warning(pop)
 
 namespace MR
 {

source/MRMesh/MRToFromEigen.h

@@ -8,27 +8,7 @@
 #include "MRSymMatrix3.h"
 #include "MRMatrix2.h"
 #include "MRMatrix3.h"
-
-// unknown pragmas
-#pragma warning(disable:4068)
-#pragma warning(disable:4127)  //C4127. "Consider using 'if constexpr' statement instead"
-
-#if defined(__clang__)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-anon-enum-enum-conversion"
-#elif defined(__GNUC__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
-#if __GNUC__ == 12
-#pragma GCC diagnostic ignored "-Warray-bounds"
-#endif
-#endif
-#include <Eigen/Core>
-#if defined(__clang__)
-#pragma clang diagnostic pop
-#elif defined(__GNUC__)
-#pragma GCC diagnostic pop
-#endif
+#include <MRPch/MREigenCore.h>
 
 namespace MR
 {

source/MRPch/MREigenCore.h

@@ -0,0 +1,28 @@
+#pragma once
+
+#pragma warning(push)
+#pragma warning(disable: 4068) // unknown pragmas
+#pragma warning(disable: 4127) // conditional expression is constant
+#pragma warning(disable: 4464) // relative include path contains '..'
+#pragma warning(disable: 4643) // Forward declaring 'tuple' in namespace std is not permitted by the C++ Standard.
+#pragma warning(disable: 5054) // operator '|': deprecated between enumerations of different types
+
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-anon-enum-enum-conversion"
+#elif defined(__GNUC__)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+#if __GNUC__ == 12
+#pragma GCC diagnostic ignored "-Warray-bounds"
+#endif
+#endif
+#include <Eigen/Core>
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#elif defined(__GNUC__)
+#pragma GCC diagnostic pop
+#endif
+
+#pragma warning(pop)
+

source/MRPch/MRPch.vcxproj

@@ -17,6 +17,7 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="MREigenCore.h" />
     <ClInclude Include="MRWasm.h" />
     <ClInclude Include="MRAsyncLaunchType.h" />
     <ClInclude Include="MREigen.h" />

source/MRPch/MRPch.vcxproj.filters

@@ -11,6 +11,7 @@
     <ClInclude Include="MRSuppressWarning.h" />
     <ClInclude Include="MRAsyncLaunchType.h" />
     <ClInclude Include="MRWasm.h" />
+    <ClInclude Include="MREigenCore.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="MRPch.cpp" />