diff options
| author | peterbell10 <peterbell10@live.co.uk> | 2017-07-30 18:55:19 +0200 |
|---|---|---|
| committer | worktycho <work.tycho@gmail.com> | 2017-07-30 18:55:19 +0200 |
| commit | 8fbb9dbf53105fc7379b5696baf2363777a29691 (patch) | |
| tree | 558f35cad855cf489d4aa0ef0cd206bca929124e /src/Globals.h | |
| parent | Added anvil enchantment handling. (#3857) (diff) | |
| download | cuberite-8fbb9dbf53105fc7379b5696baf2363777a29691.tar cuberite-8fbb9dbf53105fc7379b5696baf2363777a29691.tar.gz cuberite-8fbb9dbf53105fc7379b5696baf2363777a29691.tar.bz2 cuberite-8fbb9dbf53105fc7379b5696baf2363777a29691.tar.lz cuberite-8fbb9dbf53105fc7379b5696baf2363777a29691.tar.xz cuberite-8fbb9dbf53105fc7379b5696baf2363777a29691.tar.zst cuberite-8fbb9dbf53105fc7379b5696baf2363777a29691.zip | |
Diffstat (limited to 'src/Globals.h')
| -rw-r--r-- | src/Globals.h | 6 |
1 files changed, 4 insertions, 2 deletions
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 |