Ignore 'warning C4702: unreachable code' in MSVC 2015

pybind · Nov 18, 2020 · 483d501 · 483d501
1 parent 99ca9aa
commit 483d501
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/tests/test_iostream.cpp b/tests/test_iostream.cpp
@@ -7,6 +7,9 @@
     BSD-style license that can be found in the LICENSE file.
 */
 
+#if defined(_MSC_VER) && _MSC_VER < 1910  // VS 2015's MSVC
+#  pragma warning(disable: 4702) // unreachable code in system header (xatomic.h(382))
+#endif
 
 #include <pybind11/iostream.h>
 #include "pybind11_tests.h"
@@ -44,7 +47,7 @@ struct TestThread {
         delete t_;
     }
 
-    void stop() { stop_ = 1; }
+    void stop() { stop_ = true; }
 
     void join() {
         py::gil_scoped_release gil_lock;

diff --git a/tests/test_smart_ptr.cpp b/tests/test_smart_ptr.cpp
@@ -8,8 +8,8 @@
     BSD-style license that can be found in the LICENSE file.
 */
 
-#if defined(_MSC_VER) && _MSC_VER < 1910
-#  pragma warning(disable: 4702) // unreachable code in system header
+#if defined(_MSC_VER) && _MSC_VER < 1910  // VS 2015's MSVC
+#  pragma warning(disable: 4702) // unreachable code in system header (xatomic.h(382))
 #endif
 
 #include "pybind11_tests.h"