sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-13 00:03:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

add C++17 [[maybe_unused]] and [[no_discard]]

Browse Source
This commit is contained in:
Denis Rouzaud 2018-02-27 10:55:34 -04:00
parent 95ab3d05e0
commit 89892926c0
2 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
python/core/qgis.sip.in
View File

@ -213,6 +213,10 @@ typedef unsigned long long qgssize;
/************************************************************************
* This file has been generated automatically from *
* *

25
src/core/qgis.h
View File

@ -548,4 +548,29 @@ typedef unsigned long long qgssize;
#define FALLTHROUGH
#endif
// see https://infektor.net/posts/2017-01-19-using-cpp17-attributes-today.html#using-the-nodiscard-attribute
#if __cplusplus >= 201703L
#define NODISCARD [[nodiscard]]
#elif defined(__clang__)
#define NODISCARD [[nodiscard]]
#elif __has_cpp_attribute(nodiscard)
#define NODISCARD [[nodiscard]]
#elif __has_cpp_attribute(gnu::warn_unused_result)
#define NODISCARD [[gnu::warn_unused_result]]
#else
#define NODISCARD Q_REQUIRED_RESULT
#endif
#if __cplusplus >= 201703L
#define MAYBE_UNUSED [[maybe_unused]]
#elif defined(__clang__)
#define MAYBE_UNUSED [[maybe_unused]]
#elif __has_cpp_attribute(gnu::unused)
#define NODISCARD [[gnu::unused]]
#else
#define NODISCARD
#endif