merging with master

This commit is contained in:
Anna Gringauze
2015-11-30 12:24:00 -08:00
parent 8e744b2671
commit e3878a6556
3 changed files with 798 additions and 40 deletions

View File

@@ -51,8 +51,8 @@
#define GSL_MSVC_HAS_VARIADIC_CTOR_BUG
#define GSL_MSVC_NO_SUPPORT_FOR_MOVE_CTOR_DEFAULT
// noexcept is not understood
#ifndef GSL_THROWS_ON_CONTRACT_VIOLATION
// noexcept is not understood
#ifndef GSL_THROW_ON_CONTRACT_VIOLATION
#pragma push_macro("noexcept")
#define noexcept /* nothing */
#endif