External/fmt
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make MSVC use [[nodiscard]]

Browse Source 
Uniformly detect attributes for __cplusplus and _MSVC_LANG
This commit is contained in:
Alex Guteniev 2021-11-25 19:30:00 +02:00
parent 491ba2dda5
commit 1833c91b5a
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
include/fmt/core.h
View File

@ -18,7 +18,7 @@
// The fmt library version in the form major * 10000 + minor * 100 + patch. // The fmt library version in the form major * 10000 + minor * 100 + patch.
#define FMT_VERSION 80001 #define FMT_VERSION 80001
#if defined(__clang__) && !defined(__ibmxl__) #if defined (__clang__ ) && !defined(__ibmxl__)
# define FMT_CLANG_VERSION (__clang_major__ * 100 + __clang_minor__) # define FMT_CLANG_VERSION (__clang_major__ * 100 + __clang_minor__)
#else #else
# define FMT_CLANG_VERSION 0 # define FMT_CLANG_VERSION 0
@ -82,11 +82,17 @@
# define FMT_HAS_CPP_ATTRIBUTE(x) 0 # define FMT_HAS_CPP_ATTRIBUTE(x) 0
#endif #endif
#ifdef _MSVC_LANG
# define FMT_CPLUSPLUS _MSVC_LANG
#else
# define FMT_CPLUSPLUS __cplusplus
#endif
#define FMT_HAS_CPP14_ATTRIBUTE(attribute) \ #define FMT_HAS_CPP14_ATTRIBUTE(attribute) \
(__cplusplus >= 201402L && FMT_HAS_CPP_ATTRIBUTE(attribute)) (FMT_CPLUSPLUS >= 201402L && FMT_HAS_CPP_ATTRIBUTE(attribute))
#define FMT_HAS_CPP17_ATTRIBUTE(attribute) \ #define FMT_HAS_CPP17_ATTRIBUTE(attribute) \
(__cplusplus >= 201703L && FMT_HAS_CPP_ATTRIBUTE(attribute)) (FMT_CPLUSPLUS >= 201703L && FMT_HAS_CPP_ATTRIBUTE(attribute))
// Check if relaxed C++14 constexpr is supported. // Check if relaxed C++14 constexpr is supported.
// GCC doesn't allow throw in constexpr until version 6 (bug 67371). // GCC doesn't allow throw in constexpr until version 6 (bug 67371).
@ -180,8 +186,7 @@
# else # else
# define FMT_FALLTHROUGH # define FMT_FALLTHROUGH
# endif # endif
#elif FMT_HAS_CPP17_ATTRIBUTE(fallthrough) || \ #elif FMT_HAS_CPP17_ATTRIBUTE(fallthrough)
(defined(_MSVC_LANG) && _MSVC_LANG >= 201703L)
# define FMT_FALLTHROUGH [[fallthrough]] # define FMT_FALLTHROUGH [[fallthrough]]
#else #else
# define FMT_FALLTHROUGH # define FMT_FALLTHROUGH