diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-02-20 18:43:46 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-02-20 18:45:53 +0300 |
| commit | c0d43871e01c4dee8ef712bbb1b9a75af9947ae6 (patch) | |
| tree | 9a290d773fe64e7f8e82f148c7c5f8ff1984e108 /source/gameengine | |
| parent | fe9b21a44ad25f068da88f6e12b60c1486be3605 (diff) | |
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.
Diffstat (limited to 'source/gameengine')
| -rw-r--r-- | source/gameengine/VideoTexture/PyTypeList.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source/gameengine/VideoTexture/PyTypeList.h b/source/gameengine/VideoTexture/PyTypeList.h index a8716e72e14..ce0eb81e656 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 }; |