Skip to content

Commit 5c2ed84

Browse files
committed
Revert my previous fix 28763fa and suppress gcc false positive warnings.
1 parent 28763fa commit 5c2ed84

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

Diff for: Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ ifdef COMSPEC
7373
endif # COMSPEC
7474

7575
ifndef CXXFLAGS
76-
CXXFLAGS=-include lib/cxx11emu.h -pedantic -Wall -Wextra -Wabi -Wcast-qual -Wconversion -Wfloat-equal -Winline -Wmissing-declarations -Wmissing-format-attribute -Wno-long-long -Woverloaded-virtual -Wpacked -Wredundant-decls -Wshadow -Wsign-promo -Wno-sign-compare $(CPPCHK_GLIBCXX_DEBUG) -g
76+
CXXFLAGS=-include lib/cxx11emu.h -pedantic -Wall -Wextra -Wabi -Wcast-qual -Wconversion -Wfloat-equal -Winline -Wmissing-declarations -Wmissing-format-attribute -Wno-long-long -Woverloaded-virtual -Wpacked -Wredundant-decls -Wshadow -Wsign-promo -Wno-missing-field-initializers -Wno-missing-braces -Wno-sign-compare $(CPPCHK_GLIBCXX_DEBUG) -g
7777
endif
7878

7979
ifeq ($(HAVE_RULES),yes)

Diff for: lib/library.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ Library::Error Library::load(const tinyxml2::XMLDocument &doc)
319319
const char * const name = node->Attribute("name");
320320
if (!name)
321321
return Error(MISSING_ATTRIBUTE, "name");
322-
PodType podType = {0,0};
322+
PodType podType = {0};
323323
const char * const size = node->Attribute("sizeof");
324324
if (size)
325325
podType.size = atoi(size);

Diff for: tools/dmake.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -342,6 +342,8 @@ int main(int argc, char **argv)
342342
"-Wshadow "
343343
// "-Wsign-conversion "
344344
"-Wsign-promo "
345+
"-Wno-missing-field-initializers "
346+
"-Wno-missing-braces "
345347
// "-Wunreachable-code "
346348
"-Wno-sign-compare " // danmar: I don't like this warning, it's very rarelly a bug
347349
"$(CPPCHK_GLIBCXX_DEBUG) "

0 commit comments

Comments
 (0)