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

Merge pull request #10 from galik/master

Browse Source 
Prevent unused parameter warnings and unknown #pragma warnings on GCC.
This commit is contained in:
Gabriel Dos Reis 2015-09-21 01:51:22 -07:00
commit 4573197546
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/array_view.h
View File

@ -52,10 +52,12 @@
#endif // _NOEXCEPT #endif // _NOEXCEPT
#if _MSC_VER
#if _MSC_VER <= 1800 #if _MSC_VER <= 1800
#pragma warning(push) #pragma warning(push)
#pragma warning(disable: 4351) // warns about newly introduced aggregate initializer behavior #pragma warning(disable: 4351) // warns about newly introduced aggregate initializer behavior
#endif // _MSC_VER <= 1800 #endif // _MSC_VER <= 1800
#endif
namespace Guide { namespace Guide {
@ -547,7 +549,7 @@ namespace details
// TODO : following signature is for work around VS bug // TODO : following signature is for work around VS bug
template <typename OtherType> template <typename OtherType>
BoundsRanges (const OtherType &, bool firstLevel) {} BoundsRanges (const OtherType &, bool firstLevel) {}
BoundsRanges(const SizeType * const arr) { } BoundsRanges(const SizeType * const) { }
BoundsRanges() = default; BoundsRanges() = default;
@ -2281,9 +2283,10 @@ general_array_view_iterator<ArrayView> operator+(typename general_array_view_ite
} // namespace Guide } // namespace Guide
#if _MSC_VER
#if _MSC_VER <= 1800 #if _MSC_VER <= 1800
#pragma warning(pop) #pragma warning(pop)
#endif // _MSC_VER <= 1800 #endif // _MSC_VER <= 1800
#endif
#pragma pop_macro("_NOEXCEPT") #pragma pop_macro("_NOEXCEPT")

2
include/fail_fast.h
View File

@ -39,7 +39,7 @@ inline void fail_fast_assert(bool cond, const char* const message) { if (!cond)
#else #else
inline void fail_fast_assert(bool cond) { if (!cond) std::terminate(); } inline void fail_fast_assert(bool cond) { if (!cond) std::terminate(); }
inline void fail_fast_assert(bool cond, const char* const message) { if (!cond) std::terminate(); } inline void fail_fast_assert(bool cond, const char* const) { if (!cond) std::terminate(); }
#endif // SAFER_CPP_TESTING #endif // SAFER_CPP_TESTING