Merge pull request #127 from pjohnmeyer/up_gcc_clang_warning_levels

pjohnmeyer · web-flow · commit d8e27e182532 · 2016-08-30T20:45:40.000-05:00
Up non-MSVC warning levels
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -32,6 +32,8 @@ if (${UTPP_AMPLIFY_WARNINGS})
     # we are dealing with an MSVC or MSVC-like compiler (e.g. Intel on Windows)
     if(CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
         string(REGEX REPLACE "/W[0-4]" "/W4" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX")
+    else()
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Werror")
     endif()
 endif()
 
diff --git a/UnitTest++/Posix/SignalTranslator.cpp b/UnitTest++/Posix/SignalTranslator.cpp
@@ -28,12 +28,12 @@ namespace UnitTest {
       sigaction( SIGFPE, &action, &m_old_SIGFPE_action  );
       sigaction( SIGTRAP, &action, &m_old_SIGTRAP_action );
       sigaction( SIGBUS, &action, &m_old_SIGBUS_action  );
-      sigaction( SIGILL, &action, &m_old_SIGBUS_action  );
+      sigaction( SIGILL, &action, &m_old_SIGILL_action  );
    }
 
    SignalTranslator::~SignalTranslator()
    {
-      sigaction( SIGILL, &m_old_SIGBUS_action, 0 );
+      sigaction( SIGILL, &m_old_SIGILL_action, 0 );
       sigaction( SIGBUS, &m_old_SIGBUS_action, 0 );
       sigaction( SIGTRAP, &m_old_SIGTRAP_action, 0 );
       sigaction( SIGFPE, &m_old_SIGFPE_action, 0 );
diff --git a/UnitTest++/Posix/SignalTranslator.h b/UnitTest++/Posix/SignalTranslator.h
@@ -22,8 +22,7 @@ namespace UnitTest {
       struct sigaction m_old_SIGTRAP_action;
       struct sigaction m_old_SIGSEGV_action;
       struct sigaction m_old_SIGBUS_action;
-      struct sigaction m_old_SIGABRT_action;
-      struct sigaction m_old_SIGALRM_action;
+      struct sigaction m_old_SIGILL_action;
    };
 
 #if !defined (__GNUC__)
diff --git a/tests/TestMemoryOutStream.cpp b/tests/TestMemoryOutStream.cpp
@@ -11,7 +11,7 @@ using namespace std;
 
 namespace {
 
-   const char* const maxSignedIntegralStr(size_t nBytes)
+   const char* maxSignedIntegralStr(size_t nBytes)
    {
       switch(nBytes)
       {
@@ -28,7 +28,7 @@ namespace {
       }
    }
 
-   const char* const minSignedIntegralStr(size_t nBytes)
+   const char* minSignedIntegralStr(size_t nBytes)
    {
       switch(nBytes)
       {
@@ -45,7 +45,7 @@ namespace {
       }
    }
 
-   const char* const maxUnsignedIntegralStr(size_t nBytes)
+   const char* maxUnsignedIntegralStr(size_t nBytes)
    {
       switch(nBytes)
       {

Original file line number	Diff line number	Diff line change
`@@ -28,12 +28,12 @@ namespace UnitTest {`
`28`	`28`	`sigaction( SIGFPE, &action, &m_old_SIGFPE_action );`
`29`	`29`	`sigaction( SIGTRAP, &action, &m_old_SIGTRAP_action );`
`30`	`30`	`sigaction( SIGBUS, &action, &m_old_SIGBUS_action );`
`31`		`- sigaction( SIGILL, &action, &m_old_SIGBUS_action );`
	`31`	`+ sigaction( SIGILL, &action, &m_old_SIGILL_action );`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`SignalTranslator::~SignalTranslator()`
`35`	`35`	`{`
`36`		`- sigaction( SIGILL, &m_old_SIGBUS_action, 0 );`
	`36`	`+ sigaction( SIGILL, &m_old_SIGILL_action, 0 );`
`37`	`37`	`sigaction( SIGBUS, &m_old_SIGBUS_action, 0 );`
`38`	`38`	`sigaction( SIGTRAP, &m_old_SIGTRAP_action, 0 );`
`39`	`39`	`sigaction( SIGFPE, &m_old_SIGFPE_action, 0 );`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ using namespace std;`
`11`	`11`
`12`	`12`	`namespace {`
`13`	`13`
`14`		`- const char* const maxSignedIntegralStr(size_t nBytes)`
	`14`	`+ const char* maxSignedIntegralStr(size_t nBytes)`
`15`	`15`	`{`
`16`	`16`	`switch(nBytes)`
`17`	`17`	`{`
`@@ -28,7 +28,7 @@ namespace {`
`28`	`28`	`}`
`29`	`29`	`}`
`30`	`30`
`31`		`- const char* const minSignedIntegralStr(size_t nBytes)`
	`31`	`+ const char* minSignedIntegralStr(size_t nBytes)`
`32`	`32`	`{`
`33`	`33`	`switch(nBytes)`
`34`	`34`	`{`
`@@ -45,7 +45,7 @@ namespace {`
`45`	`45`	`}`
`46`	`46`	`}`
`47`	`47`
`48`		`- const char* const maxUnsignedIntegralStr(size_t nBytes)`
	`48`	`+ const char* maxUnsignedIntegralStr(size_t nBytes)`
`49`	`49`	`{`
`50`	`50`	`switch(nBytes)`
`51`	`51`	`{`