Skip to content
Permalink
Browse files

Merge pull request #6690 from elpaso/fix-android-build

Fix android build with osgeo4a
  • Loading branch information
elpaso committed Apr 3, 2018
2 parents 24737be + e702bd4 commit 1ff91ceb832c0682aa472e286b589e14255b8837
Showing with 10 additions and 2 deletions.
  1. +10 −2 src/core/qgis.h
@@ -555,25 +555,33 @@ typedef unsigned long long qgssize;
#define NODISCARD [[nodiscard]]
#elif defined(_MSC_VER)
#define NODISCARD // no support
#elif __has_cpp_attribute(nodiscard)
#elif defined(__has_cpp_attribute)
#if __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
#else
#define NODISCARD Q_REQUIRED_RESULT
#endif

#if __cplusplus >= 201703L
#define MAYBE_UNUSED [[maybe_unused]]
#elif defined(__clang__)
#define MAYBE_UNUSED [[maybe_unused]]
#elif defined(_MSC_VER)
#define MAYBE_UNUSED // no support
#elif __has_cpp_attribute(gnu::unused)
#elif defined(__has_cpp_attribute)
#if __has_cpp_attribute(gnu::unused)
#define MAYBE_UNUSED [[gnu::unused]]
#else
#define MAYBE_UNUSED
#endif
#else
#define MAYBE_UNUSED
#endif



0 comments on commit 1ff91ce

Please sign in to comment.
You can’t perform that action at this time.