From d4157c98b1443df24d84dc3f55b4dd90320340fd Mon Sep 17 00:00:00 2001 From: Eugene Golushkov Date: Thu, 22 Aug 2024 22:41:46 +0200 Subject: [PATCH] Fixed MSVC build; use [[deprecated]] on MSVC >= 2015 --- OgreMain/include/OgrePlatform.h | 2 +- OgreMain/include/Vao/OgreVertexElements.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/OgreMain/include/OgrePlatform.h b/OgreMain/include/OgrePlatform.h index c6361fd0061..2f523435451 100644 --- a/OgreMain/include/OgrePlatform.h +++ b/OgreMain/include/OgrePlatform.h @@ -218,7 +218,7 @@ THE SOFTWARE. #define OGRE_WARN( x ) message( __FILE__ "(" QUOTE( __LINE__ ) ") : " x "\n" ) // For marking functions as deprecated -#if __cplusplus >= 201402L +#if __cplusplus >= 201402L || OGRE_COMPILER == OGRE_COMPILER_MSVC && OGRE_COMP_VER >= 1900 # define OGRE_DEPRECATED [[deprecated]] # define OGRE_DEPRECATED_VER( x ) [[deprecated]] # define OGRE_DEPRECATED_ENUM_VER( x ) [[deprecated]] diff --git a/OgreMain/include/Vao/OgreVertexElements.h b/OgreMain/include/Vao/OgreVertexElements.h index adefce0e7fd..1759a6661e0 100644 --- a/OgreMain/include/Vao/OgreVertexElements.h +++ b/OgreMain/include/Vao/OgreVertexElements.h @@ -51,7 +51,7 @@ namespace Ogre /// Specular colours /// /// DEPRECATED. DO NOT USE. - VES_SPECULAR OGRE_DEPRECATED_VER( 4 ) = 6, + VES_SPECULAR OGRE_DEPRECATED_ENUM_VER( 4 ) = 6, /// Texture coordinates. You can have up to 8 of these. 6 if /// VES_BLEND_WEIGHTS2 or VES_BLEND_INDICES2 if present. VES_TEXTURE_COORDINATES = 7,