Silence some warnings from TBB in MSVC.

esa · Mar 5, 2021 · 4e81060 · 4e81060
1 parent b9133f4
commit 4e81060
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 0 deletions.
diff --git a/src/batch_evaluators/thread_bfe.cpp b/src/batch_evaluators/thread_bfe.cpp
@@ -32,9 +32,23 @@ see https://www.gnu.org/licenses/. */
 #include <limits>
 #include <stdexcept>
 
+#if defined(_MSC_VER)
+
+// Disable a warning from MSVC in the TBB code.
+#pragma warning(push)
+#pragma warning(disable : 4324)
+
+#endif
+
 #include <tbb/blocked_range.h>
 #include <tbb/parallel_for.h>
 
+#if defined(_MSC_VER)
+
+#pragma warning(pop)
+
+#endif
+
 #include <pagmo/batch_evaluators/thread_bfe.hpp>
 #include <pagmo/bfe.hpp>
 #include <pagmo/exceptions.hpp>

diff --git a/src/detail/bfe_impl.cpp b/src/detail/bfe_impl.cpp
@@ -30,9 +30,23 @@ see https://www.gnu.org/licenses/. */
 #include <stdexcept>
 #include <string>
 
+#if defined(_MSC_VER)
+
+// Disable a warning from MSVC in the TBB code.
+#pragma warning(push)
+#pragma warning(disable : 4324)
+
+#endif
+
 #include <tbb/blocked_range.h>
 #include <tbb/parallel_for.h>
 
+#if defined(_MSC_VER)
+
+#pragma warning(pop)
+
+#endif
+
 #include <pagmo/detail/bfe_impl.hpp>
 #include <pagmo/exceptions.hpp>
 #include <pagmo/problem.hpp>

diff --git a/src/islands/thread_island.cpp b/src/islands/thread_island.cpp
@@ -31,8 +31,22 @@ see https://www.gnu.org/licenses/. */
 #include <string>
 #include <utility>
 
+#if defined(_MSC_VER)
+
+// Disable a warning from MSVC in the TBB code.
+#pragma warning(push)
+#pragma warning(disable : 4324)
+
+#endif
+
 #include <tbb/task_group.h>
 
+#if defined(_MSC_VER)
+
+#pragma warning(pop)
+
+#endif
+
 #include <pagmo/algorithm.hpp>
 #include <pagmo/detail/gte_getter.hpp>
 #include <pagmo/exceptions.hpp>

diff --git a/src/problems/translate.cpp b/src/problems/translate.cpp
@@ -37,9 +37,23 @@ see https://www.gnu.org/licenses/. */
 #include <utility>
 #include <vector>
 
+#if defined(_MSC_VER)
+
+// Disable a warning from MSVC in the TBB code.
+#pragma warning(push)
+#pragma warning(disable : 4324)
+
+#endif
+
 #include <tbb/blocked_range.h>
 #include <tbb/parallel_for.h>
 
+#if defined(_MSC_VER)
+
+#pragma warning(pop)
+
+#endif
+
 #include <pagmo/exceptions.hpp>
 #include <pagmo/io.hpp>
 #include <pagmo/problem.hpp>