From 6050565b86e21684e1c778cb05c16bae82d1a494 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Wed, 29 May 2019 11:14:37 +0200 Subject: [PATCH] Fixed more clang warnings --- src/OpenMesh/Tools/Decimater/ModBaseT.hh | 6 +++--- src/OpenMesh/Tools/Decimater/ModQuadricT.hh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/OpenMesh/Tools/Decimater/ModBaseT.hh b/src/OpenMesh/Tools/Decimater/ModBaseT.hh index 71a006ee..f89e907e 100644 --- a/src/OpenMesh/Tools/Decimater/ModBaseT.hh +++ b/src/OpenMesh/Tools/Decimater/ModBaseT.hh @@ -128,7 +128,7 @@ private: /// Macro that sets up the name() function /// \internal #define DECIMATER_MODNAME(_mod_name) \ - virtual const std::string& name() const { \ + virtual const std::string& name() const override { \ static std::string _s_modname_(#_mod_name); return _s_modname_; \ } @@ -212,8 +212,8 @@ public: /// Virtual desctructor virtual ~ModBaseT() { } - /// Set module's name (using DECIMATER_MODNAME macro) - DECIMATER_MODNAME(ModBase); + /// Set module's name + virtual const std::string& name() const { static std::string _s_modname_("ModBase"); return _s_modname_; } /// Returns true if criteria returns a binary value. diff --git a/src/OpenMesh/Tools/Decimater/ModQuadricT.hh b/src/OpenMesh/Tools/Decimater/ModQuadricT.hh index 6dc12b45..2f431bf4 100644 --- a/src/OpenMesh/Tools/Decimater/ModQuadricT.hh +++ b/src/OpenMesh/Tools/Decimater/ModQuadricT.hh @@ -110,7 +110,7 @@ public: // inherited * \see ModBaseT::collapse_priority() for return values * \see set_max_err() */ - virtual float collapse_priority(const CollapseInfo& _ci) + virtual float collapse_priority(const CollapseInfo& _ci) override { using namespace OpenMesh;