From 1bb7e232f718d8a098654baa1d6446c68edbe87c Mon Sep 17 00:00:00 2001 From: Alexandra Heuschling Date: Tue, 5 Jan 2021 17:52:44 +0100 Subject: [PATCH] adapted property, so that is uses static function string_for_value_type (void) from binary struct for string identification --- src/OpenMesh/Core/Utils/Property.hh | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/OpenMesh/Core/Utils/Property.hh b/src/OpenMesh/Core/Utils/Property.hh index dad06f61..2f2ec135 100644 --- a/src/OpenMesh/Core/Utils/Property.hh +++ b/src/OpenMesh/Core/Utils/Property.hh @@ -41,9 +41,9 @@ -#ifndef OPENMESH_PROPERTY_HH -#define OPENMESH_PROPERTY_HH - +//#ifndef OPENMESH_PROPERTY_HH +//#define OPENMESH_PROPERTY_HH +#pragma once //== INCLUDES ================================================================= @@ -54,7 +54,8 @@ #include #include #include -#include + +#include //== NAMESPACES =============================================================== @@ -210,7 +211,7 @@ public: // data access interface std::string get_storage_name() const override { - return get_string_for_type(T()); + return OpenMesh::IO::binary::string_for_value_type(); } private: @@ -378,7 +379,7 @@ public: std::string get_storage_name() const override { - return get_string_for_type(bool()); + return OpenMesh::IO::binary::string_for_value_type(); } @@ -470,7 +471,7 @@ public: std::string get_storage_name() const override { - return get_string_for_type(std::string()); + return OpenMesh::IO::binary::string_for_value_type(); } private: @@ -595,5 +596,5 @@ struct PropHandle { } // namespace OpenMesh //============================================================================= -#endif // OPENMESH_PROPERTY_HH defined +//#endif // OPENMESH_PROPERTY_HH defined //=============================================================================