Pixyco-XYZ/openmesh
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed more clang warnings

Browse Source
This commit is contained in:
Jan Möbius
2019-05-29 11:14:37 +02:00
parent 7c1a8012d5
commit 6050565b86
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/OpenMesh/Tools/Decimater/ModBaseT.hh
View File

@@ -128,7 +128,7 @@ private:
/// Macro that sets up the name() function /// Macro that sets up the name() function
/// \internal /// \internal
#define DECIMATER_MODNAME(_mod_name) \ #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_; \ static std::string _s_modname_(#_mod_name); return _s_modname_; \
} }
@@ -212,8 +212,8 @@ public:
/// Virtual desctructor /// Virtual desctructor
virtual ~ModBaseT() { } virtual ~ModBaseT() { }
/// Set module's name (using DECIMATER_MODNAME macro) /// Set module's name
DECIMATER_MODNAME(ModBase); virtual const std::string& name() const { static std::string _s_modname_("ModBase"); return _s_modname_; }
/// Returns true if criteria returns a binary value. /// Returns true if criteria returns a binary value.

2
src/OpenMesh/Tools/Decimater/ModQuadricT.hh
View File

@@ -110,7 +110,7 @@ public: // inherited
* \see ModBaseT::collapse_priority() for return values * \see ModBaseT::collapse_priority() for return values
* \see set_max_err() * \see set_max_err()
*/ */
virtual float collapse_priority(const CollapseInfo& _ci) virtual float collapse_priority(const CollapseInfo& _ci) override
{ {
using namespace OpenMesh; using namespace OpenMesh;