Bug 1319831 - Remove an unbalanced pragma from Vector.h; r=Waldo
authorMs2ger <Ms2ger@gmail.com>
Thu, 01 Dec 2016 09:23:21 +0100
changeset 324976 296b9cc46b97eaa009a978c32f5a2c6486032677
parent 324975 806c3d121dd45fa9af850d287f61d76e33dd08f1
child 324977 77ce40d94cfabce30efafe88835cb7bbe485ba19
push id24
push usermaklebus@msu.edu
push dateTue, 20 Dec 2016 03:11:33 +0000
reviewersWaldo
bugs1319831
milestone53.0a1
Bug 1319831 - Remove an unbalanced pragma from Vector.h; r=Waldo
js/public/Vector.h
security/certverifier/CertVerifier.h
--- a/js/public/Vector.h
+++ b/js/public/Vector.h
@@ -4,22 +4,16 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef js_Vector_h
 #define js_Vector_h
 
 #include "mozilla/Vector.h"
 
-/* Silence dire "bugs in previous versions of MSVC have been fixed" warnings */
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable:4345)
-#endif
-
 namespace js {
 
 class TempAllocPolicy;
 
 namespace detail {
 
 template <typename T>
 struct TypeIsGCThing : mozilla::FalseType
--- a/security/certverifier/CertVerifier.h
+++ b/security/certverifier/CertVerifier.h
@@ -18,23 +18,19 @@
 #if defined(_MSC_VER)
 #pragma warning(push)
 // Silence "RootingAPI.h(718): warning C4324: 'js::DispatchWrapper<T>':
 // structure was padded due to alignment specifier with [ T=void * ]"
 #pragma warning(disable:4324)
 // Silence "Value.h(448): warning C4365: 'return': conversion from 'const
 // int32_t' to 'JS::Value::PayloadType', signed/unsigned mismatch"
 #pragma warning(disable:4365)
-// Silence "warning C5031: #pragma warning(pop): likely mismatch, popping
-// warning state pushed in different file 
-#pragma warning(disable:5031)
 #endif /* defined(_MSC_VER) */
 #include "mozilla/BasePrincipal.h"
 #if defined(_MSC_VER)
-#pragma warning(pop) /* popping the pragma in Vector.h */
 #pragma warning(pop) /* popping the pragma in this file */
 #endif /* defined(_MSC_VER) */
 
 namespace mozilla { namespace ct {
 
 // Including MultiLogCTVerifier.h would bring along all of its dependent
 // headers and force us to export them in moz.build. Just forward-declare
 // the class here instead.