para/GSL
1
0
Fork 0
mirror of https://github.com/microsoft/GSL.git synced 2024-11-03 17:56:43 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix #pragma warning push/pop mismatch in multi_span (Issue #431)

Browse Source 
Rearranged preprocessor code at end of file multi_span
This commit is contained in:
ErnestPenfold 2017-01-10 01:38:38 +01:00 committed by Neil MacIntosh
parent 9d13cb14c3
commit 897cc48f70
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
gsl/multi_span
View File

@ -74,7 +74,6 @@
#endif #endif
#define noexcept /*noexcept*/ #define noexcept /*noexcept*/
#endif // GSL_THROW_ON_CONTRACT_VIOLATION #endif // GSL_THROW_ON_CONTRACT_VIOLATION
namespace gsl namespace gsl
@ -2199,34 +2198,35 @@ general_span_iterator<Span> operator+(typename general_span_iterator<Span>::diff
} // namespace gsl } // namespace gsl
#ifdef _MSC_VER #ifdef GSL_THROW_ON_CONTRACT_VIOLATION
#undef constexpr
#pragma pop_macro("constexpr")
#if _MSC_VER <= 1800
#pragma warning(pop)
#ifndef GSL_THROW_ON_CONTRACT_VIOLATION
#undef noexcept
#pragma pop_macro("noexcept")
#endif // GSL_THROW_ON_CONTRACT_VIOLATION
#undef GSL_MSVC_HAS_VARIADIC_CTOR_BUG
#endif // _MSC_VER <= 1800
#endif // _MSC_VER
#if defined(GSL_THROW_ON_CONTRACT_VIOLATION)
#undef noexcept #undef noexcept
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(pop)
#pragma pop_macro("noexcept") #pragma pop_macro("noexcept")
#endif #endif
#endif // GSL_THROW_ON_CONTRACT_VIOLATION #endif // GSL_THROW_ON_CONTRACT_VIOLATION
#ifdef _MSC_VER
#if _MSC_VER <= 1800
#ifndef GSL_THROW_ON_CONTRACT_VIOLATION
#undef noexcept
#pragma pop_macro("noexcept")
#endif
#undef GSL_MSVC_HAS_VARIADIC_CTOR_BUG
#undef GSL_MSVC_NO_SUPPORT_FOR_MOVE_CTOR_DEFAULT
#pragma warning(pop)
#endif // _MSC_VER <= 1800
#undef constexpr
#pragma pop_macro("constexpr")
#pragma warning(pop)
#endif // _MSC_VER
#endif // GSL_MULTI_SPAN_H #endif // GSL_MULTI_SPAN_H