0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Expand NORETURN, enable C99 unconditionally on MSVC

Browse source 
[[noreturn]] is supported on all the compilers we support. Still need to decide
the exact minimum versions and figure out what to do with DEPRECATED and FALLTHROUGH,
so leaving those for now.

And since we require VS 2015 and up we can enable C99 unconditionally.
This commit is contained in:
Charles Dang 2018-04-14 16:04:16 +11:00
parent 00d87f8fe4
commit 96681151f0
3 changed files with 3 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gettext_boost.cpp
View file

@ -142,7 +142,7 @@ namespace
}
}
NORETURN static void throw_po_error(const std::string& lang, const std::string& dom, const std::string& detail) {
[[noreturn]] static void throw_po_error(const std::string& lang, const std::string& dom, const std::string& detail) {
std::ostringstream err;
err << "Error opening language file for " << lang << ", textdomain " << dom
<< ":\n " << detail << '\n';

13
src/global.hpp
View file

@ -16,10 +16,8 @@
#ifdef _MSC_VER
// Enable C99 support for VC14
#if _MSC_VER>=1900
// Enable C99 support
#define STDC99
#endif
#endif //_MSC_VER
@ -42,12 +40,6 @@
// Some C++11 features are not available on all supported platforms
#if defined(_MSC_VER)
// MSVC supports these starting in MSVC 2015
#if _MSC_VER >= 1900
#define NORETURN [[noreturn]]
#else
#define NORETURN __declspec(noreturn)
#endif
// MSVC supports these starting in 2017?
// Some sources claim MSVC 2015 supports them, but let's be safe...
#if _MSC_VER >= 1910
@ -67,7 +59,6 @@
#include <ciso646> // To ensure standard library version macros are defined
// All supported versions of clang have these
#define NORETURN [[noreturn]]
#define FALLTHROUGH [[clang::fallthrough]]
// Use GCC-style attribute because the __has_cpp_attribute feature-checking macro doesn't exist in clang 3.5
#define DEPRECATED(reason) __attribute__((deprecated(reason)))
@ -75,8 +66,6 @@
#endif
#if defined(__GNUC__) && !defined(__clang__)
// GCC supports these from 4.8 up
#define NORETURN [[noreturn]]
// Deprecated is supported from 4.9 up
#if __GNUC__ >= 5 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 9)

2
src/wml_exception.hpp
View file

@ -80,7 +80,7 @@
* @param function The function in which the test failed.
* @param message The translated message to show the user.
*/
NORETURN void throw_wml_exception(
[[noreturn]] void throw_wml_exception(
const char* cond
, const char* file
, int line