From f2a4165ac27e59cd495d640dc17e47a7d5aba149 Mon Sep 17 00:00:00 2001
From: Paul <pfultz2@yahoo.com>
Date: Fri, 22 May 2015 18:41:57 -0500
Subject: [PATCH] Update declarations of all global function objects

---
 fit/apply_eval.h   |  4 ++--
 fit/by.h           |  4 ++--
 fit/compose.h      |  4 ++--
 fit/conditional.h  |  4 ++--
 fit/eval.h         |  2 +-
 fit/fix.h          |  4 ++--
 fit/flip.h         |  4 ++--
 fit/identity.h     |  4 ++--
 fit/indirect.h     |  4 ++--
 fit/infix.h        |  4 ++--
 fit/lazy.h         |  6 +++---
 fit/match.h        |  4 ++--
 fit/mutable.h      |  4 ++--
 fit/pack.h         | 10 +++++-----
 fit/partial.h      |  4 ++--
 fit/pipable.h      |  4 ++--
 fit/placeholders.h | 20 ++++++++++----------
 fit/protect.h      |  4 ++--
 fit/reveal.h       |  4 ++--
 fit/tap.h          |  4 ++--
 fit/unpack.h       |  4 ++--
 fit/variadic.h     |  4 ++--
 22 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/fit/apply_eval.h b/fit/apply_eval.h
index 5fccd3b..aeef5fe 100644
--- a/fit/apply_eval.h
+++ b/fit/apply_eval.h
@@ -50,7 +50,7 @@
 
 #include <fit/returns.h>
 #include <fit/detail/forward.h>
-#include <fit/detail/static_constexpr.h>
+#include <fit/detail/static_const_var.h>
 #include <fit/eval.h>
 
 #ifndef FIT_NO_ORDERD_BRACE_INIT
@@ -119,7 +119,7 @@ struct apply_eval_f
 
 }
 
-FIT_STATIC_CONSTEXPR detail::apply_eval_f apply_eval = {};
+FIT_DECLARE_STATIC_VAR(apply_eval, detail::apply_eval_f);
 
 }
 
diff --git a/fit/by.h b/fit/by.h
index 5d925ed..f21f8c8 100644
--- a/fit/by.h
+++ b/fit/by.h
@@ -66,7 +66,7 @@
 #include <fit/returns.h>
 #include <fit/detail/move.h>
 #include <fit/detail/make.h>
-#include <fit/detail/static_constexpr.h>
+#include <fit/detail/static_const_var.h>
 #include <fit/apply_eval.h>
 
 namespace fit {
@@ -162,7 +162,7 @@ struct by_adaptor<Projection, void> : Projection
     );
 };
 
-FIT_STATIC_CONSTEXPR detail::make<by_adaptor> by = {};
+FIT_DECLARE_STATIC_VAR(by, detail::make<by_adaptor>);
 
 }
 #endif
diff --git a/fit/compose.h b/fit/compose.h
index d7c1485..fe12820 100644
--- a/fit/compose.h
+++ b/fit/compose.h
@@ -67,7 +67,7 @@
 #include <tuple>
 #include <fit/detail/move.h>
 #include <fit/detail/make.h>
-#include <fit/detail/static_constexpr.h>
+#include <fit/detail/static_const_var.h>
 
 namespace fit { namespace detail {
 
@@ -116,7 +116,7 @@ struct compose_adaptor<F> : F
 
 };
 
-FIT_STATIC_CONSTEXPR detail::make<compose_adaptor> compose = {};
+FIT_DECLARE_STATIC_VAR(compose, detail::make<compose_adaptor>);
 
 }
 
diff --git a/fit/conditional.h b/fit/conditional.h
index 7ef88d3..6affafe 100644
--- a/fit/conditional.h
+++ b/fit/conditional.h
@@ -73,7 +73,7 @@
 #include <fit/detail/delegate.h>
 #include <fit/detail/join.h>
 #include <fit/detail/make.h>
-#include <fit/detail/static_constexpr.h>
+#include <fit/detail/static_const_var.h>
 #include <type_traits>
 
 namespace fit {
@@ -146,7 +146,7 @@ struct conditional_adaptor<F> : F
     {};
 };
 
-FIT_STATIC_CONSTEXPR detail::make<conditional_adaptor> conditional = {};
+FIT_DECLARE_STATIC_VAR(conditional, detail::make<conditional_adaptor>);
 
 }
 
diff --git a/fit/eval.h b/fit/eval.h
index 00b19bd..492fd09 100644
--- a/fit/eval.h
+++ b/fit/eval.h
@@ -64,7 +64,7 @@ struct id_eval
 
 }
 
-FIT_STATIC_CONSTEXPR fit::conditional_adaptor<detail::simple_eval, detail::id_eval> eval = {};
+FIT_DECLARE_STATIC_VAR(eval, fit::conditional_adaptor<detail::simple_eval, detail::id_eval>);
 
 }
 
diff --git a/fit/fix.h b/fit/fix.h
index 683ba4f..88e52a5 100644
--- a/fit/fix.h
+++ b/fit/fix.h
@@ -48,7 +48,7 @@
 #include <fit/detail/delegate.h>
 #include <fit/detail/move.h>
 #include <fit/detail/make.h>
-#include <fit/detail/static_constexpr.h>
+#include <fit/detail/static_const_var.h>
 
 #ifndef FIT_FIX_HAS_CONSTEXPR
 #define FIT_FIX_HAS_CONSTEXPR 0
@@ -117,7 +117,7 @@ struct fix_adaptor : detail::fix_adaptor_base<fix_adaptor<F>, F>
     FIT_INHERIT_CONSTRUCTOR(fix_adaptor, base);
 };
 
-FIT_STATIC_CONSTEXPR detail::make<fix_adaptor> fix = {};
+FIT_DECLARE_STATIC_VAR(fix, detail::make<fix_adaptor>);
 
 }
 
diff --git a/fit/flip.h b/fit/flip.h
index 0a66ad7..c6fe561 100644
--- a/fit/flip.h
+++ b/fit/flip.h
@@ -40,7 +40,7 @@
 #include <fit/returns.h>
 #include <fit/reveal.h>
 #include <fit/detail/make.h>
-#include <fit/detail/static_constexpr.h>
+#include <fit/detail/static_const_var.h>
 
 namespace fit {
 
@@ -81,7 +81,7 @@ struct flip_adaptor : F
     );
 };
 
-FIT_STATIC_CONSTEXPR detail::make<flip_adaptor> flip = {};
+FIT_DECLARE_STATIC_VAR(flip, detail::make<flip_adaptor>);
 
 }
 
diff --git a/fit/identity.h b/fit/identity.h
index d61b5a2..6bc8be6 100644
--- a/fit/identity.h
+++ b/fit/identity.h
@@ -31,7 +31,7 @@
 
 #include <utility>
 #include <fit/detail/forward.h>
-#include <fit/detail/static_constexpr.h>
+#include <fit/detail/static_const_var.h>
 
 namespace fit { namespace detail {
 
@@ -46,7 +46,7 @@ struct identity_base
 
 }
 
-FIT_STATIC_CONSTEXPR detail::identity_base identity = {};
+FIT_DECLARE_STATIC_VAR(identity, detail::identity_base);
 
 }
 
diff --git a/fit/indirect.h b/fit/indirect.h
index 5835a7a..7a776db 100644
--- a/fit/indirect.h
+++ b/fit/indirect.h
@@ -53,7 +53,7 @@
 #include <fit/always.h>
 #include <fit/detail/move.h>
 #include <fit/detail/make.h>
-#include <fit/detail/static_constexpr.h>
+#include <fit/detail/static_const_var.h>
 
 namespace fit {
 
@@ -81,7 +81,7 @@ struct indirect_adaptor : F
     );
 };
 
-FIT_STATIC_CONSTEXPR detail::make<indirect_adaptor> indirect = {};
+FIT_DECLARE_STATIC_VAR(indirect, detail::make<indirect_adaptor>);
 
 }
 
diff --git a/fit/infix.h b/fit/infix.h
index 39d0018..ff3bcaa 100644
--- a/fit/infix.h
+++ b/fit/infix.h
@@ -55,7 +55,7 @@
 #include <fit/detail/move.h>
 #include <fit/function.h>
 #include <fit/detail/make.h>
-#include <fit/detail/static_constexpr.h>
+#include <fit/detail/static_const_var.h>
 
 namespace fit {
  
@@ -137,7 +137,7 @@ auto operator<(T&& x, const fit::detail::static_function_wrapper<F>& f) FIT_RETU
     detail::make_postfix_adaptor(fit::forward<T>(x), fit::move(f.base_function().infix_base_function()))
 );
 
-FIT_STATIC_CONSTEXPR detail::make<infix_adaptor> infix = {};
+FIT_DECLARE_STATIC_VAR(infix, detail::make<infix_adaptor>);
 
 }
 
diff --git a/fit/lazy.h b/fit/lazy.h
index 84953f5..a3e36eb 100644
--- a/fit/lazy.h
+++ b/fit/lazy.h
@@ -56,7 +56,7 @@
 #include <fit/detail/compressed_pair.h>
 #include <fit/pack.h>
 #include <fit/detail/make.h>
-#include <fit/detail/static_constexpr.h>
+#include <fit/detail/static_const_var.h>
 #include <functional>
 #include <type_traits>
 
@@ -114,7 +114,7 @@ struct id_transformer
     FIT_RETURNS(always_ref(x));
 };
 
-static constexpr conditional_adaptor<placeholder_transformer, bind_transformer, ref_transformer, id_transformer> pick_transformer = {};
+FIT_DECLARE_STATIC_VAR(pick_transformer, conditional_adaptor<placeholder_transformer, bind_transformer, ref_transformer, id_transformer>);
 
 template<class T, class Pack>
 constexpr auto lazy_transform(T&& x, Pack&& p) FIT_RETURNS
@@ -260,7 +260,7 @@ struct lazy_adaptor : F
     
 };
 
-FIT_STATIC_CONSTEXPR detail::make<lazy_adaptor> lazy = {};
+FIT_DECLARE_STATIC_VAR(lazy, detail::make<lazy_adaptor>);
 
 }
 
diff --git a/fit/match.h b/fit/match.h
index da91b44..b497d44 100644
--- a/fit/match.h
+++ b/fit/match.h
@@ -65,7 +65,7 @@
 #include <fit/detail/delegate.h>
 #include <fit/detail/move.h>
 #include <fit/detail/make.h>
-#include <fit/detail/static_constexpr.h>
+#include <fit/detail/static_const_var.h>
 
 namespace fit {
 
@@ -103,7 +103,7 @@ struct match_adaptor<F> : F
     FIT_INHERIT_CONSTRUCTOR(match_adaptor, F);
 };
 
-FIT_STATIC_CONSTEXPR detail::make<match_adaptor> match = {};
+FIT_DECLARE_STATIC_VAR(match, detail::make<match_adaptor>);
 
 }
 
diff --git a/fit/mutable.h b/fit/mutable.h
index 45063f0..09782ef 100644
--- a/fit/mutable.h
+++ b/fit/mutable.h
@@ -42,7 +42,7 @@
 #include <fit/detail/delegate.h>
 #include <fit/detail/move.h>
 #include <fit/detail/make.h>
-#include <fit/detail/static_constexpr.h>
+#include <fit/detail/static_const_var.h>
 
 namespace fit {
 
@@ -59,7 +59,7 @@ struct mutable_adaptor
     auto operator()(Ts&&... xs) const FIT_RETURNS(FIT_CONST_THIS->f(fit::forward<Ts>(xs)...));
 };
 
-FIT_STATIC_CONSTEXPR detail::make<mutable_adaptor> mutable_ = {};
+FIT_DECLARE_STATIC_VAR(mutable_, detail::make<mutable_adaptor>);
 
 }
 
diff --git a/fit/pack.h b/fit/pack.h
index 135a982..ae448f0 100644
--- a/fit/pack.h
+++ b/fit/pack.h
@@ -59,7 +59,7 @@
 #include <fit/detail/delegate.h>
 #include <fit/detail/remove_rvalue_reference.h>
 #include <fit/detail/unwrap.h>
-#include <fit/detail/static_constexpr.h>
+#include <fit/detail/static_const_var.h>
 #include <fit/returns.h>
 
 #ifndef FIT_HAS_RVALUE_THIS
@@ -295,11 +295,11 @@ struct pack_join_f
 
 }
 
-FIT_STATIC_CONSTEXPR detail::pack_f pack = {};
-FIT_STATIC_CONSTEXPR detail::pack_forward_f pack_forward = {};
-FIT_STATIC_CONSTEXPR detail::pack_decay_f pack_decay = {};
+FIT_DECLARE_STATIC_VAR(pack, detail::pack_f);
+FIT_DECLARE_STATIC_VAR(pack_forward, detail::pack_forward_f);
+FIT_DECLARE_STATIC_VAR(pack_decay, detail::pack_decay_f);
 
-FIT_STATIC_CONSTEXPR detail::pack_join_f pack_join = {};
+FIT_DECLARE_STATIC_VAR(pack_join, detail::pack_join_f);
 
 }
 
diff --git a/fit/partial.h b/fit/partial.h
index 173cb64..0db9d9f 100644
--- a/fit/partial.h
+++ b/fit/partial.h
@@ -56,7 +56,7 @@
 #include <fit/pipable.h>
 #include <fit/fuse.h>
 #include <fit/detail/make.h>
-#include <fit/detail/static_constexpr.h>
+#include <fit/detail/static_const_var.h>
 
 
 namespace fit { 
@@ -66,7 +66,7 @@ namespace fit {
 template<class F, class Pack=void >
 struct partial_adaptor;
 
-FIT_STATIC_CONSTEXPR detail::make<partial_adaptor> partial = {};
+FIT_DECLARE_STATIC_VAR(partial, detail::make<partial_adaptor>);
 
 namespace detail {
 
diff --git a/fit/pipable.h b/fit/pipable.h
index dd7e2a6..30d38a3 100644
--- a/fit/pipable.h
+++ b/fit/pipable.h
@@ -57,7 +57,7 @@
 #include <fit/detail/move.h>
 #include <fit/function.h>
 #include <fit/detail/make.h>
-#include <fit/detail/static_constexpr.h>
+#include <fit/detail/static_const_var.h>
 
 namespace fit { 
  
@@ -156,7 +156,7 @@ template<class A, class F>
 constexpr auto operator|(A&& a, const pipable_adaptor<F>& p) FIT_RETURNS
 (p(fit::forward<A>(a)));
 
-FIT_STATIC_CONSTEXPR detail::make<pipable_adaptor> pipable = {};
+FIT_DECLARE_STATIC_VAR(pipable, detail::make<pipable_adaptor>);
 
 // Operators for static_ adaptor
 template<class A, class F>
diff --git a/fit/placeholders.h b/fit/placeholders.h
index 86bea42..b63b65c 100644
--- a/fit/placeholders.h
+++ b/fit/placeholders.h
@@ -221,15 +221,15 @@ FIT_FOREACH_ASSIGN_OP(FIT_PLACEHOLDER_ASSIGN_OP)
 
 FIT_FOREACH_BINARY_OP(FIT_PLACEHOLDER_BINARY_OP)
 
-FIT_STATIC_CONSTEXPR placeholder<1> _1 = {};
-FIT_STATIC_CONSTEXPR placeholder<2> _2 = {};
-FIT_STATIC_CONSTEXPR placeholder<3> _3 = {};
-FIT_STATIC_CONSTEXPR placeholder<4> _4 = {};
-FIT_STATIC_CONSTEXPR placeholder<5> _5 = {};
-FIT_STATIC_CONSTEXPR placeholder<6> _6 = {};
-FIT_STATIC_CONSTEXPR placeholder<7> _7 = {};
-FIT_STATIC_CONSTEXPR placeholder<8> _8 = {};
-FIT_STATIC_CONSTEXPR placeholder<9> _9 = {};
+FIT_DECLARE_STATIC_VAR(_1, placeholder<1>);
+FIT_DECLARE_STATIC_VAR(_2, placeholder<2>);
+FIT_DECLARE_STATIC_VAR(_3, placeholder<3>);
+FIT_DECLARE_STATIC_VAR(_4, placeholder<4>);
+FIT_DECLARE_STATIC_VAR(_5, placeholder<5>);
+FIT_DECLARE_STATIC_VAR(_6, placeholder<6>);
+FIT_DECLARE_STATIC_VAR(_7, placeholder<7>);
+FIT_DECLARE_STATIC_VAR(_8, placeholder<8>);
+FIT_DECLARE_STATIC_VAR(_9, placeholder<9>);
 
 
 namespace detail {
@@ -294,7 +294,7 @@ FIT_FOREACH_ASSIGN_OP(FIT_UNAMED_PLACEHOLDER_ASSIGN_OP)
 FIT_FOREACH_BINARY_OP(FIT_UNAMED_PLACEHOLDER_BINARY_OP)
 }
 
-FIT_STATIC_CONSTEXPR detail::unamed_placeholder _ = {};
+FIT_DECLARE_STATIC_VAR(_, detail::unamed_placeholder);
 
 }
 
diff --git a/fit/protect.h b/fit/protect.h
index f9caf8c..e686974 100644
--- a/fit/protect.h
+++ b/fit/protect.h
@@ -36,7 +36,7 @@
 #include <fit/reveal.h>
 #include <fit/detail/forward.h>
 #include <fit/detail/make.h>
-#include <fit/detail/static_constexpr.h>
+#include <fit/detail/static_const_var.h>
 
 namespace fit {
 
@@ -48,7 +48,7 @@ struct protect_adaptor : F
     {}
 };
 
-FIT_STATIC_CONSTEXPR detail::make<protect_adaptor> protect = {};
+FIT_DECLARE_STATIC_VAR(protect, detail::make<protect_adaptor>);
 
 }
 #endif
diff --git a/fit/reveal.h b/fit/reveal.h
index 669a9e5..400324f 100644
--- a/fit/reveal.h
+++ b/fit/reveal.h
@@ -45,7 +45,7 @@
 #include <fit/detail/holder.h>
 #include <fit/detail/join.h>
 #include <fit/detail/make.h>
-#include <fit/detail/static_constexpr.h>
+#include <fit/detail/static_const_var.h>
 
 #ifndef FIT_HAS_TEMPLATE_ALIAS
 #if defined(__GNUC__) && !defined (__clang__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7
@@ -215,7 +215,7 @@ struct reveal_adaptor<reveal_adaptor<F>>
     FIT_INHERIT_CONSTRUCTOR(reveal_adaptor, reveal_adaptor<F>);
 };
 
-FIT_STATIC_CONSTEXPR detail::make<reveal_adaptor> reveal = {};
+FIT_DECLARE_STATIC_VAR(reveal, detail::make<reveal_adaptor>);
 
 }
 
diff --git a/fit/tap.h b/fit/tap.h
index f5848c1..b02acef 100644
--- a/fit/tap.h
+++ b/fit/tap.h
@@ -51,7 +51,7 @@
 /// 
 
 #include <fit/pipable.h>
-#include <fit/detail/static_constexpr.h>
+#include <fit/detail/static_const_var.h>
 
 namespace fit { namespace detail {
 
@@ -66,7 +66,7 @@ struct tap_f
 
 }
 
-FIT_STATIC_CONSTEXPR pipable_adaptor<detail::tap_f> tap = {};
+FIT_DECLARE_STATIC_VAR(tap, pipable_adaptor<detail::tap_f>);
 
 
 }
diff --git a/fit/unpack.h b/fit/unpack.h
index ef8eea3..d5e00c4 100644
--- a/fit/unpack.h
+++ b/fit/unpack.h
@@ -104,7 +104,7 @@
 #include <fit/detail/holder.h>
 #include <fit/detail/move.h>
 #include <fit/detail/make.h>
-#include <fit/detail/static_constexpr.h>
+#include <fit/detail/static_const_var.h>
 
 namespace fit {
 
@@ -224,7 +224,7 @@ struct unpack_adaptor : F
     );
 };
 
-FIT_STATIC_CONSTEXPR detail::make<unpack_adaptor> unpack = {};
+FIT_DECLARE_STATIC_VAR(unpack, detail::make<unpack_adaptor>);
 
 namespace detail {
 
diff --git a/fit/variadic.h b/fit/variadic.h
index 7744f26..f7f2568 100644
--- a/fit/variadic.h
+++ b/fit/variadic.h
@@ -36,7 +36,7 @@
 #include <fit/returns.h>
 #include <fit/always.h>
 #include <fit/detail/make.h>
-#include <fit/detail/static_constexpr.h>
+#include <fit/detail/static_const_var.h>
 
 namespace fit {
 
@@ -62,7 +62,7 @@ struct variadic_adaptor : F
     );
 };
 
-FIT_STATIC_CONSTEXPR detail::make<variadic_adaptor> variadic = {};
+FIT_DECLARE_STATIC_VAR(variadic, detail::make<variadic_adaptor>);
 
 }