Fix protect problems on gcc 4.6 and 4.7

boostorg · Sep 5, 2016 · 2076a44 · 2076a44
1 parent 4506f1d
commit 2076a44
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/include/fit/apply.hpp b/include/fit/apply.hpp
@@ -231,8 +231,8 @@ struct apply_f
 
 #endif
     template<class F, class... Ts>
-    constexpr FIT_SFINAE_RESULT(F, id_<Ts>...) 
-    operator()(F&& f, Ts&&... xs) const FIT_SFINAE_RETURNS
+    constexpr FIT_SFINAE_MANUAL_RESULT(F, id_<Ts>...) 
+    operator()(F&& f, Ts&&... xs) const FIT_SFINAE_MANUAL_RETURNS
     (
         f(FIT_FORWARD(Ts)(xs)...)
     );

diff --git a/test/apply.cpp b/test/apply.cpp
@@ -7,6 +7,12 @@ FIT_TEST_CASE()
     FIT_TEST_CHECK(fit::apply(binary_class(), 1, 2) == 3);
 }
 
+FIT_TEST_CASE()
+{
+    FIT_TEST_CHECK(fit::apply(fit::apply, binary_class(), 1, 2) == 3);
+    FIT_STATIC_TEST_CHECK(fit::apply(fit::apply, binary_class(), 1, 2) == 3);
+}
+
 struct member_sum_f
 {
     int i;