github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-05-21 06:45:39 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

fixed with to compile with GCC

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@8876 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2015-08-31 07:36:43 +00:00
parent d8b9354d1b
commit baa0a85e88
3 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
uppsrc/Core/Callback0.h
View file

@ -64,8 +64,11 @@ inline Callback Proxy(Callback& cb)
Callback callback(Callback cb1, Callback cb2); Callback callback(Callback cb1, Callback cb2);
Callback& operator<<(Callback& a, Callback b); Callback& operator<<(Callback& a, Callback b);
#ifdef CPP_11
inline inline
Callback& operator<<(Callback& a, std::function<void ()> fn) { return a << Callback(lambda(fn)); }; Callback& operator<<(Callback& a, std::function<void ()> fn) { return a << Callback(lambda(fn)); };
#endif
//0 args to Callback1 //0 args to Callback1
@ -151,11 +154,13 @@ Callback1<P1>& operator<<(Callback1<P1>& a, Callback1<P1> b)
return a; return a;
} }
#ifdef CPP_11
template <class P1> template <class P1>
Callback1<P1>& operator<<(Callback1<P1>& a, std::function<void (P1)> b) Callback1<P1>& operator<<(Callback1<P1>& a, std::function<void (P1)> b)
{ {
return a << Callback(lambda(b)); return a << Callback(lambda(b));
} }
#endif
//0 args to Callback2 //0 args to Callback2

4
uppsrc/Core/Map.h
View file

@ -162,7 +162,7 @@ public:
VectorMap() {} VectorMap() {}
#ifdef CPP_11 #ifdef CPP_11
VectorMap(std::initializer_list<std::pair<K, T>> init) : AMap(init) {} VectorMap(std::initializer_list<std::pair<K, T>> init) : B::AMap(init) {}
#endif #endif
friend void Swap(VectorMap& a, VectorMap& b) { a.B::Swap(b); } friend void Swap(VectorMap& a, VectorMap& b) { a.B::Swap(b); }
@ -195,7 +195,7 @@ public:
ArrayMap() {} ArrayMap() {}
#ifdef CPP_11 #ifdef CPP_11
ArrayMap(std::initializer_list<std::pair<K, T>> init) : AMap(init) {} ArrayMap(std::initializer_list<std::pair<K, T>> init) : B::AMap(init) {}
#endif #endif
friend void Swap(ArrayMap& a, ArrayMap& b) { a.B::Swap(b); } friend void Swap(ArrayMap& a, ArrayMap& b) { a.B::Swap(b); }

2
uppsrc/CtrlCore/CtrlCore.h
View file

@ -1137,7 +1137,9 @@ public:
Callback operator<<=(Callback action) { WhenAction = action; return action; } Callback operator<<=(Callback action) { WhenAction = action; return action; }
Callback& operator<<(Callback action) { return WhenAction << action; } Callback& operator<<(Callback action) { return WhenAction << action; }
#ifdef CPP_11
Callback& operator<<(std::function<void ()> action) { return WhenAction << action; } Callback& operator<<(std::function<void ()> action) { return WhenAction << action; }
#endif
void SetTimeCallback(int delay_ms, Callback cb, int id = 0); void SetTimeCallback(int delay_ms, Callback cb, int id = 0);
void KillTimeCallback(int id = 0); void KillTimeCallback(int id = 0);