Windows: Improve msvc warning suppression

nodejs · Apr 12, 2015 · 207a62d · 207a62d
1 parent 80eab78
commit 207a62d
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 19 deletions.
diff --git a/nan.h b/nan.h
@@ -28,9 +28,10 @@
 #include <cstring>
 #include <climits>
 #if defined(_MSC_VER)
+# pragma warning( push )
 # pragma warning( disable : 4530 )
 # include <string>
-# pragma warning( default : 4530 )
+# pragma warning( pop )
 #else
 # include <string>
 #endif

diff --git a/nan_implementation_12_inl.h b/nan_implementation_12_inl.h
@@ -13,9 +13,10 @@
 //==============================================================================
 
 #if defined(_MSC_VER)
+# pragma warning( push )
 # pragma warning( disable : 4530 )
 # include <string>
-# pragma warning( default : 4530 )
+# pragma warning( pop )
 #else
 # include <string>
 #endif

diff --git a/nan_implementation_pre_12_inl.h b/nan_implementation_pre_12_inl.h
@@ -12,10 +12,11 @@
 #include <algorithm>
 
 #if defined(_MSC_VER)
+# pragma warning( push )
 # pragma warning( disable : 4530 )
 # include <string>
 # include <vector>
-# pragma warning( default : 4530 )
+# pragma warning( pop )
 #else
 # include <string>
 # include <vector>

diff --git a/nan_new.h b/nan_new.h
@@ -10,9 +10,10 @@
 #define NAN_NEW_H_
 
 #if defined(_MSC_VER)
+# pragma warning( push )
 # pragma warning( disable : 4530 )
 # include <string>
-# pragma warning( default : 4530 )
+# pragma warning( pop )
 #else
 # include <string>
 #endif
@@ -201,11 +202,19 @@ NanNew() {
   return NanIntern::Factory<T>::New();
 }
 
+#if defined(_MSC_VER)
+# pragma warning( push )
+# pragma warning( disable : 4800 )
+#endif
 template <typename T, typename A0>
 typename NanIntern::Factory<T>::return_t
 NanNew(A0 arg0) {
   return NanIntern::Factory<T>::New(arg0);
 }
+#if defined(_MSC_VER)
+# pragma warning( pop )
+#endif
+
 
 template <typename T, typename A0, typename A1>
 typename NanIntern::Factory<T>::return_t

diff --git a/test/cpp/nannew.cpp b/test/cpp/nannew.cpp
@@ -15,9 +15,10 @@
 #include <cmath>
 #include <ctime>
 #if defined(_MSC_VER)
+# pragma warning( push )
 # pragma warning( disable : 4530 )
 # include <string>
-# pragma warning( default : 4530 )
+# pragma warning( pop )
 #else
 # include <string>
 #endif
@@ -383,14 +384,7 @@ NAN_METHOD(testRegression212) {
 
   typedef int  gint;
   typedef gint gboolean;
-#if defined(_MSC_VER)
-# pragma warning( disable : 4800 )
-#endif
   t.ok(_( assertType<Boolean>( NanNew<Boolean>(gboolean(23)))));
-#if defined(_MSC_VER)
-# pragma warning( default : 4800 )
-#endif
-
   return_NanUndefined();
 }
 

diff --git a/test/cpp/news.cpp b/test/cpp/news.cpp
@@ -8,9 +8,10 @@
 
 #include <nan.h>
 #if defined(_MSC_VER)
+# pragma warning( push )
 # pragma warning( disable : 4530 )
 # include <string>
-# pragma warning( default : 4530 )
+# pragma warning( pop )
 #else
 # include <string>
 #endif
@@ -163,13 +164,7 @@ NAN_METHOD(NewBoolean) {
 // #212
 NAN_METHOD(NewBoolean2) {
   NanScope();
-  #if defined(_MSC_VER)
-  # pragma warning( disable : 4800 )
-  #endif
   NanReturnValue(NanNew<v8::Boolean>(1));
-  #if defined(_MSC_VER)
-  # pragma warning( default : 4800 )
-  #endif
 }
 
 void Init(v8::Handle<v8::Object> target) {