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
53 lines
1.6 KiB
C++
53 lines
1.6 KiB
C++
/*
|
|
* ***** 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 __BLI_COMPILER_COMPAT_H__
|
|
#define __BLI_COMPILER_COMPAT_H__
|
|
|
|
/** \file BLI_compiler_compat.h
|
|
* \ingroup bli
|
|
*
|
|
* Use to help with cross platform portability.
|
|
*/
|
|
|
|
#if defined(_MSC_VER)
|
|
# define __func__ __FUNCTION__
|
|
# define alloca _alloca
|
|
#endif
|
|
|
|
/* alloca is defined here for MinGW32 */
|
|
#ifdef __MINGW32__
|
|
# include <malloc.h>
|
|
#endif
|
|
|
|
#if defined(__cplusplus) && ((__cplusplus >= 201103L) || (defined(_MSC_VER) && _MSC_VER >= 1800))
|
|
# define HAS_CPP11_FEATURES
|
|
#endif
|
|
|
|
#if (defined(__GNUC__) || defined(__clang__)) && defined(HAS_CPP11_FEATURES)
|
|
extern "C++" {
|
|
/* Some magic to be sure we don't have reference in the type. */
|
|
template<typename T> static inline T decltype_helper(T x) { return x; }
|
|
# define typeof(x) decltype(decltype_helper(x))
|
|
}
|
|
#endif
|
|
|
|
#endif /* __BLI_COMPILER_COMPAT_H__ */
|