зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1567944 - remove MSVC-specific warning goo from {Vector,Span}.h; r=dmajor
We don't support MSVC anymore, and clang-cl just ignores these pragmas. Differential Revision: https://phabricator.services.mozilla.com/D38887 --HG-- extra : moz-landing-system : lando
This commit is contained in:
Родитель
a1263fcf4d
Коммит
8a524a8529
29
mfbt/Span.h
29
mfbt/Span.h
|
@ -35,25 +35,6 @@
|
|||
# include <cstring>
|
||||
# include <iterator>
|
||||
|
||||
# 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<const char16_t> 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
|
||||
|
|
|
@ -24,12 +24,6 @@
|
|||
|
||||
#include <new> // 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 <typename T, size_t N, class AllocPolicy>
|
||||
|
@ -1519,8 +1513,4 @@ inline void Vector<T, N, AP>::swap(Vector& aOther) {
|
|||
|
||||
} // namespace mozilla
|
||||
|
||||
#ifdef _MSC_VER
|
||||
# pragma warning(pop)
|
||||
#endif
|
||||
|
||||
#endif /* mozilla_Vector_h */
|
||||
|
|
Загрузка…
Ссылка в новой задаче