Use -pedantic with compilers that support it

3 files changed, 7 insertions, 3 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9254e029..5a345e06 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,7 +23,11 @@ endif()
 CHECK_CXX_COMPILER_FLAG("-Wall" WALL_FLAG_SUPPORTED)
 if ( WALL_FLAG_SUPPORTED AND NOT CMAKE_CXX_FLAGS MATCHES "(^| )-Wall($| )")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
-endif ( WALL_FLAG_SUPPORTED )
+endif ( )
+CHECK_CXX_COMPILER_FLAG("-Wpedantic" PEDANTIC_FLAG_SUPPORTED)
+if ( PEDANTIC_FLAG_SUPPORTED AND NOT CMAKE_CXX_FLAGS MATCHES "(^| )pedantic($| )")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wpedantic")
+endif ( )
 
 if ( CMAKE_VERSION VERSION_LESS "3.1" )
     CHECK_CXX_COMPILER_FLAG("-std=c++11" STD_FLAG_SUPPORTED)
diff --git a/logging.h b/logging.h
index e2a4c9a7..aaeceeac 100644
--- a/logging.h
+++ b/logging.h
@@ -50,7 +50,7 @@ namespace QMatrixClient
 #else
             return debug_object.noquote();
 #endif
-    };
+    }
 
     /**
      * @brief A helper operator to facilitate usage of formatJson (and possibly
diff --git a/util.h b/util.h
index c9e2d1c9..1f9e3f0b 100644
--- a/util.h
+++ b/util.h
@@ -232,7 +232,7 @@ namespace QMatrixClient
     Dispatch<ResultT, ArgTs...> dispatch(ArgTs&& ... args)
     {
         return Dispatch<ResultT, ArgTs...>(std::forward<ArgTs...>(args)...);
-    };
+    }
 
     // The below enables pretty-printing of enums in logs
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 5, 0))