From 8fbb9dbf53105fc7379b5696baf2363777a29691 Mon Sep 17 00:00:00 2001 From: peterbell10 Date: Sun, 30 Jul 2017 17:55:19 +0100 Subject: cParsedNBT: Improved error reporting (#3876) * cParsedNBT: Improved error reporting * Fix typos --- src/Globals.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/Globals.h') diff --git a/src/Globals.h b/src/Globals.h index 854ddcc62..4c0d37b81 100644 --- a/src/Globals.h +++ b/src/Globals.h @@ -46,10 +46,11 @@ #define SIZE_T_FMT_HEX "%Ix" #define NORETURN __declspec(noreturn) - #if (_MSC_VER < 1910) - // MSVC 2013 (and possibly 2015?) have no idea about "noexcept(false)" + #if (_MSC_VER < 1900) // noexcept support was added in VS 2015 + #define NOEXCEPT throw() #define CAN_THROW throw(...) #else + #define NOEXCEPT noexcept #define CAN_THROW noexcept(false) #endif @@ -108,6 +109,7 @@ #endif #define NORETURN __attribute((__noreturn__)) + #define NOEXCEPT noexcept #define CAN_THROW noexcept(false) #else -- cgit v1.2.3