JDBtracker
/
libostd
forked from OctaForge/libostd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix octa::MapRange func type checks for regular functors

master
Daniel Kolesa 2015-06-07 15:49:08 +01:00
parent 36d9a35066
commit 93652ed81f
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
octa/algorithm.h
View File

@ -445,35 +445,36 @@ namespace detail {
};
template<typename T, typename R, typename F,
bool = octa::IsDefaultConstructible<F>::value &&
octa::IsMoveConstructible<F>::value
bool = MapFuncTest<T, F>::value
> struct MapFuncTypeObjBase {
typedef octa::Function<R(octa::RangeReference<T>)> Type;
};
template<typename T, typename R, typename F>
struct MapFuncTypeObjBase<T, R, F, true> {
typedef F Type;
typedef MapLambdaRet<F>(*Type)(MapLambdaArg<F>);
};
template<typename T, typename R, typename F, bool = MapFuncTest<T, F>::value>
struct MapFuncTypeObj {
template<typename T, typename R, typename F,
bool = octa::IsDefaultConstructible<F>::value &&
octa::IsMoveConstructible<F>::value
> struct MapFuncTypeObj {
typedef typename MapFuncTypeObjBase<T, R, F>::Type Type;
};
template<typename T, typename R, typename F>
struct MapFuncTypeObj<T, R, F, true> {
typedef MapLambdaRet<F>(*Type)(MapLambdaArg<F>);
typedef F Type;
};
template<typename T, typename R, typename F, bool = octa::IsClass<F>::value>
struct MapFuncType {
typedef typename MapFuncTypeObj<T, R, F>::Type Type;
typedef F Type;
};
template<typename T, typename R, typename F>
struct MapFuncType<T, R, F, false> {
typedef F Type;
struct MapFuncType<T, R, F, true> {
typedef typename MapFuncTypeObj<T, R, F>::Type Type;
};
}