From 826d5bb00b74a19b894ac67e337f9e932619c2c5 Mon Sep 17 00:00:00 2001
From: Edoardo Prezioso <edo88@email.it>
Date: Wed, 18 Jul 2012 00:50:30 +0200
Subject: [PATCH] Since the GCC -Wconversion warnings are fixed (at least on a
 x86-64 environment), enable it in the Makefile.

---
 Makefile        | 2 +-
 tools/dmake.cpp | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index aa2cd2a72..b82f5dc9b 100644
--- a/Makefile
+++ b/Makefile
@@ -37,7 +37,7 @@ else # !COMSPEC
 endif # COMSPEC
 
 ifndef CXXFLAGS
-    CXXFLAGS=-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 $(CPPCHK_GLIBCXX_DEBUG) -g
+    CXXFLAGS=-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 $(CPPCHK_GLIBCXX_DEBUG) -g
 endif
 
 ifeq ($(HAVE_RULES),yes)
diff --git a/tools/dmake.cpp b/tools/dmake.cpp
index abfc69993..2d1b24a5a 100644
--- a/tools/dmake.cpp
+++ b/tools/dmake.cpp
@@ -263,7 +263,6 @@ int main(int argc, char **argv)
     } else {
         // TODO: add more compiler warnings.
         // -Wlogical-op       : doesn't work on older GCC
-        // -Wconversion       : too many warnings
         // -Wsign-conversion  : too many warnings
         // -Wunreachable-code : some GCC versions report lots of warnings
         makeConditionalVariable(fout, "CXXFLAGS",
@@ -272,7 +271,7 @@ int main(int argc, char **argv)
                                 "-Wextra "
                                 "-Wabi "
                                 "-Wcast-qual "
-//                                "-Wconversion "
+                                "-Wconversion "
                                 "-Wfloat-equal "
                                 "-Winline "
 //                                "-Wlogical-op "