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

gcc warning fixes

master
Daniel Kolesa 2015-06-07 18:30:28 +01:00
parent 23261d6d5b
commit 4a45d03544
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
octa/functional.h
View File

@ -366,11 +366,21 @@ namespace detail {
template<typename A> template<typename A>
A &get_alloc() { A &get_alloc() {
return (A &)manager; union {
const FunctionManager **m;
A *alloc;
} u;
u.m = &manager;
return *u.alloc;
} }
template<typename A> template<typename A>
const A &get_alloc() const { const A &get_alloc() const {
return (const A &)manager; union {
const FunctionManager * const *m;
const A *alloc;
} u;
u.m = &manager;
return *u.alloc;
} }
}; };
@ -394,7 +404,12 @@ namespace detail {
} }
static T &get_ref(const FmStorage &s) { static T &get_ref(const FmStorage &s) {
return (T &)(s.data); union {
const FunctorData *data;
T *ret;
} u;
u.data = &s.data;
return *u.ret;
} }
}; };
@ -741,7 +756,7 @@ namespace detail {
template<typename C, typename R, typename ...A> template<typename C, typename R, typename ...A>
struct DcLambdaTypes<R (C::*)(A...) const> { struct DcLambdaTypes<R (C::*)(A...) const> {
typedef R (*Ptr)(A...); typedef octa::Function<R(A...)> Ptr;
typedef octa::Function<R(A...)> Obj; typedef octa::Function<R(A...)> Obj;
}; };