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

Fix android build with osgeo4a
qgis · Apr 3, 2018 · 1ff91ce · 1ff91ce
2 parents 24737be + e702bd4
commit 1ff91ce
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/src/core/qgis.h b/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