From b85b66d679172a2edcfcf5af383350dc7ce01ad6 Mon Sep 17 00:00:00 2001 From: Nicolas Gallego-Ortiz Date: Thu, 15 Aug 2019 10:47:37 +0200 Subject: [PATCH] lowercase filename, pragma once and property specializations corrected --- src/OpenMesh/Core/Utils/Property.hh | 4 ++-- src/OpenMesh/Core/Utils/PropertyContainer.hh | 2 +- src/OpenMesh/Core/Utils/typename.hh | 5 +---- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/OpenMesh/Core/Utils/Property.hh b/src/OpenMesh/Core/Utils/Property.hh index d896e1b8..7f913ec1 100644 --- a/src/OpenMesh/Core/Utils/Property.hh +++ b/src/OpenMesh/Core/Utils/Property.hh @@ -396,8 +396,8 @@ public: public: - explicit PropertyT(const std::string& _name = "") - : BaseProperty(_name) + explicit PropertyT(const std::string& _name = "", const std::string& _internal_type_name="" ) + : BaseProperty(_name, _internal_type_name) { } public: // inherited from BaseProperty diff --git a/src/OpenMesh/Core/Utils/PropertyContainer.hh b/src/OpenMesh/Core/Utils/PropertyContainer.hh index 6d9506c0..297d16b9 100644 --- a/src/OpenMesh/Core/Utils/PropertyContainer.hh +++ b/src/OpenMesh/Core/Utils/PropertyContainer.hh @@ -45,7 +45,7 @@ #define OPENMESH_PROPERTYCONTAINER #include -#include +#include //----------------------------------------------------------------------------- namespace OpenMesh diff --git a/src/OpenMesh/Core/Utils/typename.hh b/src/OpenMesh/Core/Utils/typename.hh index 3dd4ba30..8c6ba8bc 100644 --- a/src/OpenMesh/Core/Utils/typename.hh +++ b/src/OpenMesh/Core/Utils/typename.hh @@ -1,5 +1,4 @@ -#ifndef TYPENAME_HH -#define TYPENAME_HH +#pragma once /// Get an internal name for a type /// Important, this is depends on compilers and versions, do NOT se in file formats! @@ -25,5 +24,3 @@ std::string get_type_name() } } - -#endif // TYPENAME_HH -- GitLab