diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-02-09 20:23:21 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-03-13 14:47:40 +0300 |
commit | 63ea8dd156b39eb57b73a953f5ac9ae54b7a447a (patch) | |
tree | 768a5dbb95f7a4b50f7f9e857beedd27f3c0175b /source/blender/freestyle/intern/view_map/AutoPtrHelper.h | |
parent | 278871db5bdef68cf128dd01fb9c722db55054e3 (diff) |
Initial compilation support with C++11 featureset enabled
This commit makes some preliminary fixes and tweaks aimed to make blender
compilable with C++11 feature set. This includes:
- Build system attribute to enable C++11 featureset.
It's for sure default OFF, but easy to enable to have a play around with
it and make sure all the stuff is compilable before we go C++11 for real.
- Changes in Compositor to use non-named cl_int structure fields.
This is because __STRICT_ANSI__ is defined by default by GCC and OpenCL
does not use named fields in this case.
- Changes to TYPE_CHECK() related on lack of typeof() in C++11
This uses decltype() instead with some trickery to make sure returned type
is not a reference.
- Changes for auto_ptr in Freestyle
This actually conditionally switches between auto_ptr and unique_ptr since
auto_ptr is deprecated in C++11. Seems to be not strictly needed but still
nice to be ready for such an update anyway/
This all based on changes form depsgraph_refactor branch apart from the weird
changes which were made in order to support MinGW compilation. Those parts of
change would need to be carefully reviewed again after official move to gcc49
in MinGW.
Tested on Linux with GCC-4.7 and Clang-3.5, other platforms are not tested and
likely needs some more tweaks.
Reviewers: campbellbarton, juicyfruit, mont29, lukastoenne, psy-fi, kjym3
Differential Revision: https://developer.blender.org/D1089
Diffstat (limited to 'source/blender/freestyle/intern/view_map/AutoPtrHelper.h')
-rw-r--r-- | source/blender/freestyle/intern/view_map/AutoPtrHelper.h | 60 |
1 files changed, 60 insertions, 0 deletions
diff --git a/source/blender/freestyle/intern/view_map/AutoPtrHelper.h b/source/blender/freestyle/intern/view_map/AutoPtrHelper.h new file mode 100644 index 00000000000..17a43c184c7 --- /dev/null +++ b/source/blender/freestyle/intern/view_map/AutoPtrHelper.h @@ -0,0 +1,60 @@ +/* + * ***** BEGIN GPL LICENSE BLOCK ***** + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * ***** END GPL LICENSE BLOCK ***** + */ + +#ifndef __FREESTYLE_AUTOPTR_HELPER_H__ +#define __FREESTYLE_AUTOPTR_HELPER_H__ + +/** \file blender/freestyle/intern/view_map/AutoPtrHelper.h + * \ingroup freestyle + * \brief Utility header for auto_ptr/unique_ptr selection + * \author Sergey Sharybin + * \date 2015-02-09 + */ + +#include <memory> + +namespace Freestyle { + +#if __cplusplus > 199711L +template<typename T> +class AutoPtr : public std::unique_ptr<T> { +public: + AutoPtr() : std::unique_ptr<T>() {} + AutoPtr(T *ptr) : std::unique_ptr<T>(ptr) {} + + /* TODO(sergey): Is there more clear way to do this? */ + template<typename X> + AutoPtr(AutoPtr<X>& other) : std::unique_ptr<T>(other.get()) { + other.release(); + } +}; +#else +template<typename T> +class AutoPtr : public std::auto_ptr<T> { +public: + AutoPtr() : std::auto_ptr<T>() {} + AutoPtr(T *ptr) : std::auto_ptr<T>(ptr) {} + AutoPtr(std::auto_ptr_ref<T> ref) : std::auto_ptr<T>(ref) {} +}; +#endif + +} /* namespace Freestyle */ + +#endif // __FREESTYLE_AUTOPTR_HELPER_H__ |