Fix clang fallthrough for libdxfrw

qgis · Aug 6, 2018 · 00fbd412d8b6ff7af37bbcc392555e8f39948154 · 00fbd41
1 parent 2f829e0
commit 00fbd412d8b6ff7af37bbcc392555e8f39948154
Unified Split

Showing with 4 additions and 3 deletions.

+3 −2 external/libdxfrw/intern/dwgutil.cpp

+1 −1 external/libdxfrw/libdxfrw.cpp
diff --git a/external/libdxfrw/intern/dwgutil.cpp b/external/libdxfrw/intern/dwgutil.cpp
@@ -19,7 +19,7 @@
 #if __cplusplus >= 201500
 #define FALLTHROUGH [[fallthrough]];
 #elif defined(__clang__)
-#define FALLTHROUGH //[[clang::fallthrough]]
+#define FALLTHROUGH [[clang::fallthrough]]
 #elif defined(__GNUC__) && __GNUC__ >= 7
 #define FALLTHROUGH [[gnu::fallthrough]];
 #else
@@ -28,7 +28,8 @@
 
 #include "qgslogger.h"
 
-/** Utility function
+/**
+ * Utility function
  * convert a int to string in hex
  **/
 namespace DRW

diff --git a/external/libdxfrw/libdxfrw.cpp b/external/libdxfrw/libdxfrw.cpp
@@ -27,7 +27,7 @@
 #if __cplusplus >= 201500
 #define FALLTHROUGH [[fallthrough]];
 #elif defined(__clang__)
-#define FALLTHROUGH //[[clang::fallthrough]]
+#define FALLTHROUGH [[clang::fallthrough]]
 #elif defined(__GNUC__) && __GNUC__ >= 7
 #define FALLTHROUGH [[gnu::fallthrough]];
 #else