Jelajahi Sumber

Fixed GCC/Clang warnings.

Branimir Karadzic 11 tahun lalu
induk
melakukan
d54063bfd5
2 mengubah file dengan 5 tambahan dan 4 penghapusan
  1. 1 1
      examples/20-nanovg/nanovg.cpp
  2. 4 3
      examples/common/nanovg/nanovg.cpp

+ 1 - 1
examples/20-nanovg/nanovg.cpp

@@ -33,7 +33,7 @@
 #include "nanovg/nanovg.h"
 
 BX_PRAGMA_DIAGNOSTIC_PUSH();
-BX_PRAGMA_DIAGNOSTIC_IGNORED_GCC("-Wunused-parameter");
+BX_PRAGMA_DIAGNOSTIC_IGNORED_CLANG_GCC("-Wunused-parameter");
 #define BLENDISH_IMPLEMENTATION
 #include "blendish.h"
 BX_PRAGMA_DIAGNOSTIC_POP();

+ 4 - 3
examples/common/nanovg/nanovg.cpp

@@ -22,13 +22,14 @@
 
 #include <bx/macros.h>
 
-BX_PRAGMA_DIAGNOSTIC_IGNORED_MSVC(4505) // error C4505: '' : unreferenced local function has been removed
 BX_PRAGMA_DIAGNOSTIC_IGNORED_MSVC(4701) // error C4701: potentially uninitialized local variable 'cint' used
-// MSVC doesn't like 4505 wrapped with warning disable push/pop.
+// -Wunused-function and 4505 must be file scope, can't be disabled between push/pop.
+BX_PRAGMA_DIAGNOSTIC_IGNORED_CLANG_GCC("-Wunused-function");
+BX_PRAGMA_DIAGNOSTIC_IGNORED_MSVC(4505) // error C4505: '' : unreferenced local function has been removed
 
 BX_PRAGMA_DIAGNOSTIC_PUSH();
-BX_PRAGMA_DIAGNOSTIC_IGNORED_CLANG_GCC("-Wunused-function");
 BX_PRAGMA_DIAGNOSTIC_IGNORED_CLANG_GCC("-Wunused-parameter");
+BX_PRAGMA_DIAGNOSTIC_IGNORED_GCC("-Wunused-result");
 #define FONTSTASH_IMPLEMENTATION
 #include "fontstash.h"
 BX_PRAGMA_DIAGNOSTIC_POP();