diff --git a/Makefile b/Makefile index 928182a5702..46c8d98511b 100644 --- a/Makefile +++ b/Makefile @@ -73,7 +73,7 @@ ifdef COMSPEC endif # COMSPEC ifndef CXXFLAGS - 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 + CXXFLAGS=-include lib/cxx11emu.h -pedantic -Wall -Wextra -Wabi -Wcast-qual -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 endif ifeq ($(HAVE_RULES),yes) diff --git a/tools/dmake.cpp b/tools/dmake.cpp index 84b06e6ac13..bb1563de50b 100644 --- a/tools/dmake.cpp +++ b/tools/dmake.cpp @@ -325,7 +325,7 @@ int main(int argc, char **argv) "-Wextra " "-Wabi " "-Wcast-qual " - "-Wconversion " +// "-Wconversion " // danmar: gives fp. for instance: unsigned int sizeof_pointer = sizeof(void *); "-Wfloat-equal " "-Winline " // "-Wlogical-op "