diff --git a/mfbt/Span.h b/mfbt/Span.h index 5ca9e6050944..c9a79605f717 100644 --- a/mfbt/Span.h +++ b/mfbt/Span.h @@ -35,25 +35,6 @@ # include # include -# ifdef _MSC_VER -# pragma warning(push) - -// turn off some warnings that are noisy about our MOZ_RELEASE_ASSERT statements -# pragma warning(disable : 4127) // conditional expression is constant - -// blanket turn off warnings from CppCoreCheck for now -// so people aren't annoyed by them when running the tool. -// more targeted suppressions will be added in a future update to the GSL -# pragma warning( \ - disable : 26481 26482 26483 26485 26490 26491 26492 26493 26495) - -# if _MSC_VER < 1910 -# pragma push_macro("constexpr") -# define constexpr /*constexpr*/ - -# endif // _MSC_VER < 1910 -# endif // _MSC_VER - namespace mozilla { // Stuff from gsl_util @@ -929,14 +910,4 @@ inline Span MakeStringSpan(const char16_t* aZeroTerminated) { } // namespace mozilla -# ifdef _MSC_VER -# if _MSC_VER < 1910 -# undef constexpr -# pragma pop_macro("constexpr") - -# endif // _MSC_VER < 1910 - -# pragma warning(pop) -# endif // _MSC_VER - #endif // mozilla_Span_h diff --git a/mfbt/Vector.h b/mfbt/Vector.h index 2c60e5eabdfa..f03e857f43df 100644 --- a/mfbt/Vector.h +++ b/mfbt/Vector.h @@ -24,12 +24,6 @@ #include // for placement new -/* Silence dire "bugs in previous versions of MSVC have been fixed" warnings */ -#ifdef _MSC_VER -# pragma warning(push) -# pragma warning(disable : 4345) -#endif - namespace mozilla { template @@ -1519,8 +1513,4 @@ inline void Vector::swap(Vector& aOther) { } // namespace mozilla -#ifdef _MSC_VER -# pragma warning(pop) -#endif - #endif /* mozilla_Vector_h */