Fixed MSVC build; use [[deprecated]] on MSVC >= 2015

OGRECave · Aug 22, 2024 · d4157c9 · d4157c9
1 parent e5f6cc5
commit d4157c9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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,