Droog71
/
pioneer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix all remaining gcc warnings 

Fixes #3935
master
Peter 2017-04-25 13:38:08 +02:00 committed by ecraven
parent 8dc87c925e
commit 88aaf4107f
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
contrib/json/JsonUtils.cpp
View File

@ -10,7 +10,14 @@
#include "../../src/Serializer.h" // Need this for the exceptions
extern "C" {
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wattributes"
#endif
#include "miniz/miniz.h"
#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif
}
namespace {

8
src/StringF.cpp
View File

@ -360,10 +360,10 @@ std::string to_string(const std::string& value, const FormatSpec& fmt) {
// ---------------------------------------------------------------------------
// ## string_format() and helpers
static inline const char* scan_unformatted(const char* fmt) {
const char *c = fmt;
return c;
}
// static inline const char* scan_unformatted(const char* fmt) {
// const char *c = fmt;
// return c;
// }
static inline const char* scan_int(const char* fmt, int& value) {
value = 0;