amorfo77/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2026-08-03 16:02:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

🚧 trying nodiscard attribute #1433

Browse Source
This commit is contained in:
Niels Lohmann
2019-01-19 17:32:23 +01:00
parent b9a39b38bf
commit d359fd3a8d
7 changed files with 49 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/nlohmann/detail/macro_scope.hpp
+9
View File
@@ -37,6 +37,15 @@
#define JSON_DEPRECATED
#endif
// allow for portable nodiscard warnings
#if defined(__has_cpp_attribute) && __has_cpp_attribute(nodiscard)
#define JSON_NODISCARD [[nodiscard]]
#elif defined(__has_cpp_attribute) && __has_cpp_attribute(gnu::warn_unused_result)
#define JSON_NODISCARD [[gnu::warn_unused_result]]
#else
#define JSON_NODISCARD
#endif
// allow to disable exceptions
#if (defined(__cpp_exceptions) || defined(__EXCEPTIONS) || defined(_CPPUNWIND)) && !defined(JSON_NOEXCEPTION)
#define JSON_THROW(exception) throw exception
include/nlohmann/detail/macro_unscope.hpp
+1
View File
@@ -16,6 +16,7 @@
#undef JSON_LIKELY
#undef JSON_UNLIKELY
#undef JSON_DEPRECATED
#undef JSON_NODISCARD
#undef JSON_HAS_CPP_14
#undef JSON_HAS_CPP_17
#undef NLOHMANN_BASIC_JSON_TPL_DECLARATION