From 417a460645cf5c5d54be5b1c0d41a5c2aa6cc670 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20M=C3=B6bius?= <moebius@cs.rwth-aachen.de>
Date: Wed, 29 May 2019 10:20:20 +0200
Subject: [PATCH] Fixed more clang warnings

---
 cmake/ACGCompiler.cmake                   | 7 ++++---
 src/OpenMesh/Core/IO/reader/BaseReader.hh | 9 ++-------
 src/OpenMesh/Core/IO/reader/OFFReader.hh  | 7 +------
 src/OpenMesh/Core/Utils/SingletonT.hh     | 7 +------
 4 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/cmake/ACGCompiler.cmake b/cmake/ACGCompiler.cmake
index f5260c9b..464d4f49 100644
--- a/cmake/ACGCompiler.cmake
+++ b/cmake/ACGCompiler.cmake
@@ -62,7 +62,7 @@ if (UNIX)
   # add our standard flags for Template inclusion
   list(APPEND ADDITIONAL_CXX_FLAGS          "-DINCLUDE_TEMPLATES" )
   list(APPEND ADDITIONAL_C_FLAGS            "-DINCLUDE_TEMPLATES" )
-
+  
   ################################################################################
   # OS Defines
   ################################################################################  
@@ -108,9 +108,10 @@ if (UNIX)
   list(APPEND ADDITIONAL_C_FLAGS            ${COMPILER_WARNINGS} )
 
 
-  if ("${CMAKE_CXX_COMPILER}" MATCHES ".*clang.*")
+  if ("${CMAKE_CXX_COMPILER}" MATCHES "Clang")
       list(APPEND ADDITIONAL_CXX_FLAGS "-Weverything")
       list(APPEND ADDITIONAL_CXX_FLAGS "-Wno-c++98-compat")
+      list(APPEND ADDITIONAL_CXX_FLAGS "-Wno-c++98-compat-pedantic")
       list(APPEND ADDITIONAL_CXX_FLAGS "-Wno-padded")
       list(APPEND ADDITIONAL_CXX_FLAGS "-Wno-old-style-cast")
       list(APPEND ADDITIONAL_CXX_FLAGS "-Wno-documentation-unknown-command")
@@ -120,7 +121,7 @@ if (UNIX)
       list(APPEND ADDITIONAL_CXX_FLAGS "-Wno-deprecated")
       list(APPEND ADDITIONAL_CXX_FLAGS "-Wno-weak-vtables")
   endif()
-
+  
   ################################################################################
   # STL Vector checks
   ################################################################################
diff --git a/src/OpenMesh/Core/IO/reader/BaseReader.hh b/src/OpenMesh/Core/IO/reader/BaseReader.hh
index 6361bfd3..9f6c23bb 100644
--- a/src/OpenMesh/Core/IO/reader/BaseReader.hh
+++ b/src/OpenMesh/Core/IO/reader/BaseReader.hh
@@ -48,10 +48,7 @@
 //
 //=============================================================================
 
-
-#ifndef __BASEREADER_HH__
-#define __BASEREADER_HH__
-
+#pragma once
 
 //=== INCLUDES ================================================================
 
@@ -91,7 +88,7 @@ class OPENMESHDLLEXPORT BaseReader
 public:
 
   /// Destructor
-  virtual ~BaseReader() {};
+  virtual ~BaseReader() {}
 
   /// Returns a brief description of the file type that can be parsed.
   virtual std::string get_description() const = 0;
@@ -204,5 +201,3 @@ static inline std::string &trim(std::string &_string) {
 } // namespace IO
 } // namespace OpenMesh
 //=============================================================================
-#endif
-//=============================================================================
diff --git a/src/OpenMesh/Core/IO/reader/OFFReader.hh b/src/OpenMesh/Core/IO/reader/OFFReader.hh
index 25717b6f..2efe6e4a 100644
--- a/src/OpenMesh/Core/IO/reader/OFFReader.hh
+++ b/src/OpenMesh/Core/IO/reader/OFFReader.hh
@@ -48,10 +48,7 @@
 //
 //=============================================================================
 
-
-#ifndef __OFFREADER_HH__
-#define __OFFREADER_HH__
-
+#pragma once
 
 //=== INCLUDES ================================================================
 
@@ -162,5 +159,3 @@ OPENMESHDLLEXPORT _OFFReader_& OFFReader();
 } // namespace IO
 } // namespace OpenMesh
 //=============================================================================
-#endif
-//=============================================================================
diff --git a/src/OpenMesh/Core/Utils/SingletonT.hh b/src/OpenMesh/Core/Utils/SingletonT.hh
index 2945debb..438cd655 100644
--- a/src/OpenMesh/Core/Utils/SingletonT.hh
+++ b/src/OpenMesh/Core/Utils/SingletonT.hh
@@ -48,10 +48,7 @@
 //
 //=============================================================================
 
-
-#ifndef __SINGLETON_HH__
-#define __SINGLETON_HH__
-
+#pragma once
 
 //=== INCLUDES ================================================================
 
@@ -145,5 +142,3 @@ private:
 #  include "SingletonT_impl.hh"
 #endif
 //=============================================================================
-#endif // __SINGLETON_HH__
-//=============================================================================