Commit dc3bcebd by Marcus Winter

base_cpp: removed warnings from function implementation when building with clang

parent 75f78215
...@@ -334,7 +334,7 @@ template <class C, typename R, ...@@ -334,7 +334,7 @@ template <class C, typename R,
Function<R, T1> Bind( Function<R, T1> Bind(
C & obj, C & obj,
R(C::*func)(T1), R(C::*func)(T1),
Placeholder::Arg_1 p1) { Placeholder::Arg_1) {
return Function<R, T1>(obj, func); return Function<R, T1>(obj, func);
} }
...@@ -342,7 +342,7 @@ template <typename R, ...@@ -342,7 +342,7 @@ template <typename R,
typename T1> typename T1>
Function<R, T1> Bind( Function<R, T1> Bind(
R(*func)(T1), R(*func)(T1),
Placeholder::Arg_1 p1) { Placeholder::Arg_1) {
return Function<R, T1>(func); return Function<R, T1>(func);
} }
......
...@@ -422,8 +422,8 @@ template <class C, typename R, ...@@ -422,8 +422,8 @@ template <class C, typename R,
Function<R, T1, T2> Bind( Function<R, T1, T2> Bind(
C & obj, C & obj,
R(C::*func)(T1, T2), R(C::*func)(T1, T2),
Placeholder::Arg_1 p1, Placeholder::Arg_1,
Placeholder::Arg_2 p2) { Placeholder::Arg_2) {
return Function<R, T1, T2>(obj, func); return Function<R, T1, T2>(obj, func);
} }
...@@ -431,8 +431,8 @@ template <typename R, ...@@ -431,8 +431,8 @@ template <typename R,
typename T1, typename T2> typename T1, typename T2>
Function<R, T1, T2> Bind( Function<R, T1, T2> Bind(
R(*func)(T1, T2), R(*func)(T1, T2),
Placeholder::Arg_1 p1, Placeholder::Arg_1,
Placeholder::Arg_2 p2) { Placeholder::Arg_2) {
return Function<R, T1, T2>(func); return Function<R, T1, T2>(func);
} }
......
...@@ -468,9 +468,9 @@ template <class C, typename R, ...@@ -468,9 +468,9 @@ template <class C, typename R,
Function<R, T1, T2, T3> Bind( Function<R, T1, T2, T3> Bind(
C & obj, C & obj,
R(C::*func)(T1, T2, T3), R(C::*func)(T1, T2, T3),
Placeholder::Arg_1 p1, Placeholder::Arg_1,
Placeholder::Arg_2 p2, Placeholder::Arg_2,
Placeholder::Arg_3 p3) { Placeholder::Arg_3) {
return Function<R, T1, T2, T3>(obj, func); return Function<R, T1, T2, T3>(obj, func);
} }
...@@ -478,9 +478,9 @@ template <typename R, ...@@ -478,9 +478,9 @@ template <typename R,
typename T1, typename T2, typename T3> typename T1, typename T2, typename T3>
Function<R, T1, T2, T3> Bind( Function<R, T1, T2, T3> Bind(
R(*func)(T1, T2, T3), R(*func)(T1, T2, T3),
Placeholder::Arg_1 p1, Placeholder::Arg_1,
Placeholder::Arg_2 p2, Placeholder::Arg_2,
Placeholder::Arg_3 p3) { Placeholder::Arg_3) {
return Function<R, T1, T2, T3>(func); return Function<R, T1, T2, T3>(func);
} }
......
...@@ -517,10 +517,10 @@ template <class C, typename R, ...@@ -517,10 +517,10 @@ template <class C, typename R,
Function<R, T1, T2, T3, T4> Bind( Function<R, T1, T2, T3, T4> Bind(
C & obj, C & obj,
R(C::*func)(T1, T2, T3, T4), R(C::*func)(T1, T2, T3, T4),
Placeholder::Arg_1 p1, Placeholder::Arg_1,
Placeholder::Arg_2 p2, Placeholder::Arg_2,
Placeholder::Arg_3 p3, Placeholder::Arg_3,
Placeholder::Arg_4 p4) { Placeholder::Arg_4) {
return Function<R, T1, T2, T3, T4>(obj, func); return Function<R, T1, T2, T3, T4>(obj, func);
} }
...@@ -528,10 +528,10 @@ template <typename R, ...@@ -528,10 +528,10 @@ template <typename R,
typename T1, typename T2, typename T3, typename T4> typename T1, typename T2, typename T3, typename T4>
Function<R, T1, T2, T3, T4> Bind( Function<R, T1, T2, T3, T4> Bind(
R(*func)(T1, T2, T3, T4), R(*func)(T1, T2, T3, T4),
Placeholder::Arg_1 p1, Placeholder::Arg_1,
Placeholder::Arg_2 p2, Placeholder::Arg_2,
Placeholder::Arg_3 p3, Placeholder::Arg_3,
Placeholder::Arg_4 p4) { Placeholder::Arg_4) {
return Function<R, T1, T2, T3, T4>(func); return Function<R, T1, T2, T3, T4>(func);
} }
......
...@@ -567,11 +567,11 @@ template <class C, typename R, ...@@ -567,11 +567,11 @@ template <class C, typename R,
Function<R, T1, T2, T3, T4, T5> Bind( Function<R, T1, T2, T3, T4, T5> Bind(
C & obj, C & obj,
R(C::*func)(T1, T2, T3, T4, T5), R(C::*func)(T1, T2, T3, T4, T5),
Placeholder::Arg_1 p1, Placeholder::Arg_1,
Placeholder::Arg_2 p2, Placeholder::Arg_2,
Placeholder::Arg_3 p3, Placeholder::Arg_3,
Placeholder::Arg_4 p4, Placeholder::Arg_4,
Placeholder::Arg_5 p5) { Placeholder::Arg_5) {
return Function<R, T1, T2, T3, T4, T5>(obj, func); return Function<R, T1, T2, T3, T4, T5>(obj, func);
} }
...@@ -579,11 +579,11 @@ template <typename R, ...@@ -579,11 +579,11 @@ template <typename R,
typename T1, typename T2, typename T3, typename T4, typename T5> typename T1, typename T2, typename T3, typename T4, typename T5>
Function<R, T1, T2, T3, T4, T5> Bind( Function<R, T1, T2, T3, T4, T5> Bind(
R(*func)(T1, T2, T3, T4, T5), R(*func)(T1, T2, T3, T4, T5),
Placeholder::Arg_1 p1, Placeholder::Arg_1,
Placeholder::Arg_2 p2, Placeholder::Arg_2,
Placeholder::Arg_3 p3, Placeholder::Arg_3,
Placeholder::Arg_4 p4, Placeholder::Arg_4,
Placeholder::Arg_5 p5) { Placeholder::Arg_5) {
return Function<R, T1, T2, T3, T4, T5>(func); return Function<R, T1, T2, T3, T4, T5>(func);
} }
......
...@@ -497,7 +497,7 @@ function make_functionN(arg_cnt) ...@@ -497,7 +497,7 @@ function make_functionN(arg_cnt)
local bound_param_list_c = "" local bound_param_list_c = ""
for i = 1, arg_cnt, 1 do for i = 1, arg_cnt, 1 do
bound_param_list_c = bound_param_list_c..",\n Placeholder::Arg_"..i.." p"..i bound_param_list_c = bound_param_list_c..",\n Placeholder::Arg_"..i
end end
file:write(CR_templ.."\n") file:write(CR_templ.."\n")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment