From a756bff46095a550cca936161f17e19b65dd34e1 Mon Sep 17 00:00:00 2001 From: Martin Marinov Date: Tue, 12 May 2020 21:06:40 +0100 Subject: [PATCH 1/2] Add OM_SUPPRESS_DEPRECATED to allow suppressing deprecated warnings which can break builds where warnings are treated as errors --- src/OpenMesh/Core/System/config.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/OpenMesh/Core/System/config.h b/src/OpenMesh/Core/System/config.h index 9d09ade6..a8a5a1fa 100644 --- a/src/OpenMesh/Core/System/config.h +++ b/src/OpenMesh/Core/System/config.h @@ -83,7 +83,12 @@ # endif #endif -#if defined(_MSC_VER) +//! define OM_SUPPRESS_DEPRECATED to suppress deprecated code warnings +#if defined(OM_SUPPRESS_DEPRECATED) +#pragma message( \ + "OpenMesh deprecated code warnings suppressed, please fix your code soon") +# define OM_DEPRECATED(msg) +#elif defined(_MSC_VER) # define OM_DEPRECATED(msg) __declspec(deprecated(msg)) #elif defined(__GNUC__) # if (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) >= 40500 /* Test for GCC >= 4.5.0 */ From 061bd7ee6ac833672fc296305ecbbee4a477b9d0 Mon Sep 17 00:00:00 2001 From: Martin Marinov Date: Wed, 13 May 2020 02:14:14 +0100 Subject: [PATCH 2/2] Fix a size_t to int cast warning --- src/OpenMesh/Core/IO/writer/OBJWriter.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/OpenMesh/Core/IO/writer/OBJWriter.cc b/src/OpenMesh/Core/IO/writer/OBJWriter.cc index bda4a97a..681fbfb1 100644 --- a/src/OpenMesh/Core/IO/writer/OBJWriter.cc +++ b/src/OpenMesh/Core/IO/writer/OBJWriter.cc @@ -274,7 +274,7 @@ write(std::ostream& _out, BaseExporter& _be, Options _opt, std::streamsize _prec unsigned int num = _be.get_face_texcoords(texCoords); for(size_t i = 0; i < num ; ++i) { - texMap[texCoords[i]] = i; + texMap[texCoords[i]] = static_cast(i); } }