Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-25 03:12:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

assume compiler features introduced in C++11 are supported by the compiler

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev 2020-01-02 23:27:48 +00:00
parent 74e458b163
commit c45efa3915
2 changed files with 4 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/core/concurrent/qtconcurrentrun.h
View file

@ -80,8 +80,6 @@ QFuture<T> run(T (*functionPointer)(Param1, Param2, Param3, Param4, Param5), con
return (new StoredFunctorCall5<T, T (*)(Param1, Param2, Param3, Param4, Param5), Arg1, Arg2, Arg3, Arg4, Arg5>(functionPointer, arg1, arg2, arg3, arg4, arg5))->start(); return (new StoredFunctorCall5<T, T (*)(Param1, Param2, Param3, Param4, Param5), Arg1, Arg2, Arg3, Arg4, Arg5>(functionPointer, arg1, arg2, arg3, arg4, arg5))->start();
} }
#if defined(Q_COMPILER_DECLTYPE) && defined(Q_COMPILER_AUTO_FUNCTION)
template <typename Functor> template <typename Functor>
auto run(Functor functor) -> typename std::enable_if<!QtPrivate::HasResultType<Functor>::Value, QFuture<decltype(functor())> >::Type auto run(Functor functor) -> typename std::enable_if<!QtPrivate::HasResultType<Functor>::Value, QFuture<decltype(functor())> >::Type
{ {
@ -129,8 +127,6 @@ auto run(Functor functor, const Arg1 &arg1, const Arg2 &arg2, const Arg3 &arg3,
return (new StoredFunctorCall5<result_type, Functor, Arg1, Arg2, Arg3, Arg4, Arg5>(functor, arg1, arg2, arg3, arg4, arg5))->start(); return (new StoredFunctorCall5<result_type, Functor, Arg1, Arg2, Arg3, Arg4, Arg5>(functor, arg1, arg2, arg3, arg4, arg5))->start();
} }
#endif
template <typename FunctionObject> template <typename FunctionObject>
QFuture<typename FunctionObject::result_type> run(FunctionObject functionObject) QFuture<typename FunctionObject::result_type> run(FunctionObject functionObject)
{ {

73
src/core/global/qglobal.h.cmake
View file

@ -317,20 +317,9 @@ QT_USE_NAMESPACE
/* /*
* C++11 support * C++11 support
* *
* Paper Macro SD-6 macro * Paper Macro SD-6 macro
* N2541 Q_COMPILER_AUTO_FUNCTION * N2672 Q_COMPILER_INITIALIZER_LISTS
* N1984 N2546 Q_COMPILER_AUTO_TYPE
* N2437 Q_COMPILER_CLASS_ENUM
* N2235 Q_COMPILER_CONSTEXPR __cpp_constexpr = 200704
* N2343 N3276 Q_COMPILER_DECLTYPE __cpp_decltype = 200707
* N2346 Q_COMPILER_DEFAULT_DELETE_MEMBERS
* N1987 Q_COMPILER_EXTERN_TEMPLATES
* N2672 Q_COMPILER_INITIALIZER_LISTS
* N2658 N2927 Q_COMPILER_LAMBDA __cpp_lambdas = 200907
* N2118 N2844 N3053 Q_COMPILER_RVALUE_REFS __cpp_rvalue_references = 200610 * N2118 N2844 N3053 Q_COMPILER_RVALUE_REFS __cpp_rvalue_references = 200610
* N2442 Q_COMPILER_UNICODE_STRINGS __cpp_unicode_literals = 200710
* N2242 N2555 Q_COMPILER_VARIADIC_TEMPLATES __cpp_variadic_templates = 200704
* N2431 Q_COMPILER_NULLPTR
* *
* For any future version of the C++ standard, we use only the SD-6 macro. * For any future version of the C++ standard, we use only the SD-6 macro.
* For full listing, see * For full listing, see
@ -342,21 +331,9 @@ QT_USE_NAMESPACE
# if defined(__GXX_EXPERIMENTAL_CXX0X__) || __cplusplus >= 201103L # if defined(__GXX_EXPERIMENTAL_CXX0X__) || __cplusplus >= 201103L
/* C++0x features supported in GCC 4.3: */ /* C++0x features supported in GCC 4.3: */
# define Q_COMPILER_RVALUE_REFS # define Q_COMPILER_RVALUE_REFS
# define Q_COMPILER_DECLTYPE
/* C++0x features supported in GCC 4.4: */ /* C++0x features supported in GCC 4.4: */
# define Q_COMPILER_VARIADIC_TEMPLATES
# define Q_COMPILER_AUTO_FUNCTION
# define Q_COMPILER_AUTO_TYPE
# define Q_COMPILER_EXTERN_TEMPLATES
# define Q_COMPILER_DEFAULT_DELETE_MEMBERS
# define Q_COMPILER_CLASS_ENUM
# define Q_COMPILER_INITIALIZER_LISTS # define Q_COMPILER_INITIALIZER_LISTS
# /* C++0x features supported in GCC 4.5: */
# define Q_COMPILER_LAMBDA
# define Q_COMPILER_UNICODE_STRINGS
# /* C++0x features supported in GCC 4.6: */ # /* C++0x features supported in GCC 4.6: */
# define Q_COMPILER_CONSTEXPR
# define Q_COMPILER_NULLPTR
# ifdef __EXCEPTIONS # ifdef __EXCEPTIONS
# define Q_COMPILER_EXCEPTIONS # define Q_COMPILER_EXCEPTIONS
# endif # endif
@ -365,46 +342,14 @@ QT_USE_NAMESPACE
#elif defined(Q_CC_CLANG) #elif defined(Q_CC_CLANG)
# if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__) # if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__)
/* Detect C++ features using __has_feature(), see http://clang.llvm.org/docs/LanguageExtensions.html#cxx11 */ /* Detect C++ features using __has_feature(), see http://clang.llvm.org/docs/LanguageExtensions.html#cxx11 */
# if __has_feature(cxx_auto_type)
# define Q_COMPILER_AUTO_FUNCTION
# define Q_COMPILER_AUTO_TYPE
# endif
# if __has_feature(cxx_constexpr)
# define Q_COMPILER_CONSTEXPR
# endif
# if __has_feature(cxx_decltype) /* && __has_feature(cxx_decltype_incomplete_return_types) */
# define Q_COMPILER_DECLTYPE
# endif
# if __has_feature(cxx_defaulted_functions) && __has_feature(cxx_deleted_functions)
# define Q_COMPILER_DEFAULT_DELETE_MEMBERS
# endif
# if __has_feature(cxx_generalized_initializers) # if __has_feature(cxx_generalized_initializers)
# define Q_COMPILER_INITIALIZER_LISTS # define Q_COMPILER_INITIALIZER_LISTS
# endif # endif
# if __has_feature(cxx_lambdas)
# define Q_COMPILER_LAMBDA
# endif
# if __has_feature(cxx_rvalue_references) # if __has_feature(cxx_rvalue_references)
# define Q_COMPILER_RVALUE_REFS # define Q_COMPILER_RVALUE_REFS
# endif # endif
# if __has_feature(cxx_strong_enums)
# define Q_COMPILER_CLASS_ENUM
# endif
# if __has_feature(cxx_unicode_literals)
# define Q_COMPILER_UNICODE_STRINGS
# endif
# if __has_feature(cxx_variadic_templates)
# define Q_COMPILER_VARIADIC_TEMPLATES
# endif
# if __has_feature(cxx_nullptr)
# define Q_COMPILER_NULLPTR
# endif
# if __has_feature(cxx_exceptions) # if __has_feature(cxx_exceptions)
# define Q_COMPILER_EXCEPTIONS # define Q_COMPILER_EXCEPTIONS
# endif
/* Features that have no __has_feature() check */
# if ((__clang_major__ * 100) + __clang_minor__) >= 209 /* since clang 2.9 */
# define Q_COMPILER_EXTERN_TEMPLATES
# endif # endif
# endif # endif
#endif #endif
@ -412,18 +357,8 @@ QT_USE_NAMESPACE
#define Q_OUTOFLINE_TEMPLATE #define Q_OUTOFLINE_TEMPLATE
#define Q_INLINE_TEMPLATE inline #define Q_INLINE_TEMPLATE inline
#define Q_TYPENAME typename #define Q_TYPENAME typename
#define Q_NULLPTR nullptr
#ifdef Q_COMPILER_CONSTEXPR #define Q_DECL_CONSTEXPR constexpr
# define Q_DECL_CONSTEXPR constexpr
#else
# define Q_DECL_CONSTEXPR
#endif
#ifdef Q_COMPILER_NULLPTR
# define Q_NULLPTR nullptr
#else
# define Q_NULLPTR NULL
#endif
#ifndef Q_CONSTRUCTOR_FUNCTION #ifndef Q_CONSTRUCTOR_FUNCTION
# define Q_CONSTRUCTOR_FUNCTION0(AFUNC) \ # define Q_CONSTRUCTOR_FUNCTION0(AFUNC) \