[Bf-blender-cvs] [c0d4387] master: Make Blender ready for C++11

Sergey Sharybin noreply at git.blender.org
Sat Feb 20 16:45:56 CET 2016


Commit: c0d43871e01c4dee8ef712bbb1b9a75af9947ae6
Author: Sergey Sharybin
Date:   Sat Feb 20 16:43:46 2016 +0100
Branches: master
https://developer.blender.org/rBc0d43871e01c4dee8ef712bbb1b9a75af9947ae6

Make Blender ready for C++11

Did a full compile of debug build with C++11 enabled, it all passed compilation
apart from some deprecated type used in GE's Video Texture. Solved it inside of
ifdef block now.

In the future we should uncomment the MSVC part of it, it should all be safe and
correct (MSVC2013 does not define new C++ version but supports C++11). The reason
it is commented is to have absolutely no effect on the upcoming release.

===================================================================

M	source/gameengine/VideoTexture/PyTypeList.h

===================================================================

diff --git a/source/gameengine/VideoTexture/PyTypeList.h b/source/gameengine/VideoTexture/PyTypeList.h
index a8716e7..ce0eb81 100644
--- a/source/gameengine/VideoTexture/PyTypeList.h
+++ b/source/gameengine/VideoTexture/PyTypeList.h
@@ -66,7 +66,11 @@ public:
 
 protected:
 	/// pointer to list of types
+#if (__cplusplus > 199711L) /* || (defined(_MSC_VER) && _MSC_VER >= 1800) */
+	std::unique_ptr<PyTypeListType> m_list;
+#else
 	std::auto_ptr<PyTypeListType> m_list;
+#endif
 };




More information about the Bf-blender-cvs mailing list