Issue #155: Remove FIT_HAS_STATIC_LAMBDA configuration

boostorg · Mar 27, 2016 · 37355c5 · 37355c5
1 parent 1a9b1ec
commit 37355c5
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 28 deletions.
diff --git a/include/fit/lambda.hpp b/include/fit/lambda.hpp
@@ -69,8 +69,6 @@
 #include <fit/detail/static_const_var.hpp>
 
 
-#define FIT_HAS_STATIC_LAMBDA 1
-
 #ifndef FIT_REWRITE_STATIC_LAMBDA
 #ifdef _MSC_VER
 #define FIT_REWRITE_STATIC_LAMBDA 1

diff --git a/test/conditional.cpp b/test/conditional.cpp
@@ -91,7 +91,7 @@ FIT_TEST_CASE()
     FIT_TEST_CHECK(lam(t3()) == 3);
 }
 #endif
-#if FIT_HAS_STATIC_LAMBDA
+
 FIT_STATIC_LAMBDA_FUNCTION(static_fun) = fit::conditional(
     [](t1)
     {
@@ -113,7 +113,6 @@ FIT_TEST_CASE()
     FIT_TEST_CHECK(static_fun(t2()) == 2);
     FIT_TEST_CHECK(static_fun(t3()) == 3);
 }
-#endif
 
 FIT_TEST_CASE()
 {

diff --git a/test/lambda.cpp b/test/lambda.cpp
@@ -6,7 +6,7 @@
 #include <memory>
 #include "test.hpp"
 
-#if FIT_HAS_STATIC_LAMBDA
+
 static constexpr auto add_one = FIT_STATIC_LAMBDA(int x)
 {
     return x + 1;
@@ -90,4 +90,3 @@ FIT_TEST_CASE()
 }
 
 }
-#endif
diff --git a/test/match.cpp b/test/match.cpp
@@ -74,7 +74,7 @@ FIT_TEST_CASE()
     FIT_STATIC_TEST_CHECK(fit::reveal(fun)(1) == 1);
     FIT_STATIC_TEST_CHECK(fit::reveal(fun)(foo()) == 2);
 };
-#if FIT_HAS_STATIC_LAMBDA
+
 FIT_TEST_CASE()
 {
 
@@ -86,7 +86,6 @@ FIT_TEST_CASE()
     FIT_TEST_CHECK(lam(1) == 1);
     FIT_TEST_CHECK(lam(foo()) == 2);
 };
-#endif
 
 FIT_TEST_CASE()
 {

diff --git a/test/reveal.cpp b/test/reveal.cpp
@@ -38,7 +38,7 @@ FIT_TEST_CASE()
     static_assert(!fit::is_callable<fit::reveal_adaptor<f_type>, int>::value, "Callable");
     // fit::reveal(f)(1);
 }
-#if FIT_HAS_STATIC_LAMBDA
+
 #ifndef _MSC_VER
 static constexpr auto lam = fit::conditional(
     FIT_STATIC_LAMBDA(t1)
@@ -99,7 +99,6 @@ FIT_TEST_CASE()
 
     // fit::reveal(static_fun)(1);
 }
-#endif
 
 struct integral_type
 {

diff --git a/test/static_def/static_def.cpp b/test/static_def/static_def.cpp
@@ -15,7 +15,7 @@ extern void* f_sum_constexpr_fo_addr();
 
 extern void* sum_var_addr();
 extern void* sum_constexpr_fo_addr();
-#if FIT_HAS_STATIC_LAMBDA
+
 void* sum_lambda_addr()
 {
     return (void*)&fit_test::fit_sum_lambda;
@@ -24,7 +24,6 @@ void* sum_fo_addr()
 {
     return (void*)&fit_test::fit_sum_fo;
 }
-#endif
 
 void* sum_var_addr()
 {
@@ -37,13 +36,10 @@ void* sum_constexpr_fo_addr()
 
 int main()
 {
-#if FIT_HAS_STATIC_LAMBDA
     if (fit_test::fit_sum_fo(1, 2) != 3) printf("FAILED\n");
     if (fit_test::fit_sum_lambda(1, 2) != 3) printf("FAILED\n");
-#endif
     if (fit_test::fit_sum(1, 2) != 3) printf("FAILED\n");
 
-#if FIT_HAS_STATIC_LAMBDA
 #if !FIT_NO_UNIQUE_STATIC_LAMBDA_FUNCTION_ADDR
     if (sum_lambda_addr() != f_sum_lambda_addr()) printf("FAILED: Lambda\n");
     if (sum_fo_addr() != f_sum_fo_addr()) printf("FAILED: Function object\n");
@@ -52,7 +48,6 @@ int main()
 #if !FIT_NO_UNIQUE_STATIC_VAR
     if (sum_var_addr() != f_sum_var_addr()) printf("FAILED: Lambda\n");
     if (sum_constexpr_fo_addr() != f_sum_constexpr_fo_addr()) printf("FAILED: Function object\n");
-#endif
 #endif
     return f();
 }
diff --git a/test/static_def/static_def.hpp b/test/static_def/static_def.hpp
@@ -6,12 +6,11 @@
 #include <fit/lambda.hpp>
 
 namespace fit_test {
-#if FIT_HAS_STATIC_LAMBDA
+
 FIT_STATIC_LAMBDA_FUNCTION(fit_sum_lambda) = [](int x, int y) 
 {
     return x + y;
 };
-#endif
 
 struct fit_sum_f
 {
@@ -20,9 +19,9 @@ struct fit_sum_f
         return x + y;
     }
 };
-#if FIT_HAS_STATIC_LAMBDA
+
 FIT_STATIC_LAMBDA_FUNCTION(fit_sum_fo) = fit_sum_f();
-#endif
+
 FIT_STATIC_FUNCTION(fit_sum_constexpr_fo) = fit_sum_f();
 
 FIT_DECLARE_STATIC_VAR(fit_sum_var, fit_sum_f);

diff --git a/test/static_def/static_def2.cpp b/test/static_def/static_def2.cpp
@@ -13,7 +13,7 @@ extern void* f_sum_constexpr_fo_addr();
 
 extern void* sum_var_addr();
 extern void* sum_constexpr_fo_addr();
-#if FIT_HAS_STATIC_LAMBDA
+
 void* f_sum_lambda_addr()
 {
     return (void*)&fit_test::fit_sum_lambda;
@@ -22,7 +22,7 @@ void* f_sum_fo_addr()
 {
     return (void*)&fit_test::fit_sum_fo;
 }
-#endif
+
 void* f_sum_var_addr()
 {
     return (void*)&fit_test::fit_sum_var;
@@ -34,13 +34,10 @@ void* f_sum_constexpr_fo_addr()
 
 int f()
 {
-#if FIT_HAS_STATIC_LAMBDA
     if (fit_test::fit_sum_fo(1, 2) != 3) printf("FAILED\n");
     if (fit_test::fit_sum_lambda(1, 2) != 3) printf("FAILED\n");
-#endif
     if (fit_test::fit_sum(1, 2) != 3) printf("FAILED\n");
 
-#if FIT_HAS_STATIC_LAMBDA
 #if !FIT_NO_UNIQUE_STATIC_LAMBDA_FUNCTION_ADDR
     if (sum_lambda_addr() != f_sum_lambda_addr()) printf("FAILED: Lambda\n");
     if (sum_fo_addr() != f_sum_fo_addr()) printf("FAILED: Function object\n");
@@ -49,7 +46,6 @@ int f()
 #if !FIT_NO_UNIQUE_STATIC_VAR
     if (sum_var_addr() != f_sum_var_addr()) printf("FAILED: Lambda\n");
     if (sum_constexpr_fo_addr() != f_sum_constexpr_fo_addr()) printf("FAILED: Function object\n");
-#endif
 #endif
     return 0;
 }

diff --git a/test/unpack.cpp b/test/unpack.cpp
@@ -112,7 +112,7 @@ FIT_TEST_CASE()
     static_assert(fit::is_unpackable<tuple_type&&>::value, "Not unpackable");
 
 }
-#if FIT_HAS_STATIC_LAMBDA
+
 FIT_STATIC_AUTO lambda_unary_unpack = fit::unpack(FIT_STATIC_LAMBDA(int x)
 {
     return x;
@@ -127,7 +127,7 @@ FIT_TEST_CASE()
 {
     FIT_TEST_CHECK(3 == lambda_unary_unpack(fit::pack_decay(3)));
 }
-#endif
+
 struct unary_move
 {
     std::unique_ptr<int> i;