Fix more adl functions

boostorg · Sep 8, 2017 · b0858f3 · b0858f3
1 parent 2564a2d
commit b0858f3
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 26 deletions.
diff --git a/include/fit/apply_eval.hpp b/include/fit/apply_eval.hpp
@@ -125,10 +125,10 @@ struct apply_eval_f
     {
         return
 #if FIT_NO_ORDERED_BRACE_INIT
-        detail::eval_ordered<R>
+        fit::detail::eval_ordered<R>
             (f, fit::pack(), FIT_FORWARD(Ts)(xs)...);
 #else
-        detail::eval_helper<R>
+        fit::detail::eval_helper<R>
             {f, fit::eval(FIT_FORWARD(Ts)(xs))...}.get_result();
 #endif
     }
@@ -143,10 +143,10 @@ struct apply_eval_f
     {
         return (typename detail::holder<Ts...>::type)
 #if FIT_NO_ORDERED_BRACE_INIT
-        detail::eval_ordered<R>
+        fit::detail::eval_ordered<R>
             (f, fit::pack(), FIT_FORWARD(Ts)(xs)...);
 #else
-        detail::eval_helper<R>
+        fit::detail::eval_helper<R>
             {f, fit::eval(FIT_FORWARD(Ts)(xs))...};
 #endif
     }

diff --git a/include/fit/arg.hpp b/include/fit/arg.hpp
@@ -85,7 +85,7 @@ constexpr args_at<N...> make_args_at(seq<N...>) noexcept
 template<std::size_t N, class... Ts>
 constexpr auto get_args(Ts&&... xs) FIT_RETURNS
 (
-    detail::make_args_at(typename gens<N>::type())(nullptr, FIT_RETURNS_CONSTRUCT(perfect_ref<Ts>)(xs)...)
+    fit::detail::make_args_at(typename gens<N>::type())(nullptr, FIT_RETURNS_CONSTRUCT(perfect_ref<Ts>)(xs)...)
 );
 
 template<class T, T N>
@@ -94,7 +94,7 @@ struct make_args_f
     template<class... Ts, class=typename std::enable_if<(N <= sizeof...(Ts))>::type>
     constexpr auto operator()(Ts&&... xs) const FIT_RETURNS
     (
-        detail::get_args<N>(FIT_FORWARD(Ts)(xs)...)
+        fit::detail::get_args<N>(FIT_FORWARD(Ts)(xs)...)
     );
 };
 
@@ -115,7 +115,7 @@ FIT_STATIC_CONSTEXPR detail::make_args_f<std::size_t, N> arg_c = {};
 template<std::size_t N, class... Ts>
 constexpr auto arg_c(Ts&&... xs) FIT_RETURNS
 (
-    detail::get_args<N>(FIT_FORWARD(Ts)(xs)...)
+    fit::detail::get_args<N>(FIT_FORWARD(Ts)(xs)...)
 );
 #endif
 

diff --git a/include/fit/by.hpp b/include/fit/by.hpp
@@ -160,7 +160,7 @@ constexpr R by_eval(const Projection& p, const F& f, Ts&&... xs)
 template<class Projection, class... Ts>
 constexpr FIT_ALWAYS_VOID_RETURN by_void_eval(const Projection& p, Ts&&... xs)
 {
-    return fit::apply_eval(fit::always(), detail::make_project_void_eval(FIT_FORWARD(Ts)(xs), p)...);
+    return fit::apply_eval(fit::always(), fit::detail::make_project_void_eval(FIT_FORWARD(Ts)(xs), p)...);
 }
 
 struct swallow
@@ -216,7 +216,7 @@ struct by_adaptor : detail::compressed_pair<detail::callable_base<Projection>, d
     constexpr FIT_SFINAE_RESULT(const detail::callable_base<F>&, result_of<const detail::callable_base<Projection>&, id_<Ts>>...) 
     operator()(Ts&&... xs) const FIT_SFINAE_RETURNS
     (
-        detail::by_eval(
+        fit::detail::by_eval(
             FIT_MANGLE_CAST(const detail::callable_base<Projection>&)(FIT_CONST_THIS->base_projection(xs...)),
             FIT_MANGLE_CAST(const detail::callable_base<F>&)(FIT_CONST_THIS->base_function(xs...)),
             FIT_FORWARD(Ts)(xs)...
@@ -247,12 +247,12 @@ struct by_adaptor<Projection, void> : detail::callable_base<Projection>
     constexpr FIT_BY_VOID_RETURN operator()(Ts&&... xs) const 
     {
 #if FIT_NO_ORDERED_BRACE_INIT
-        return detail::by_void_eval(this->base_projection(xs...), FIT_FORWARD(Ts)(xs)...);
+        return fit::detail::by_void_eval(this->base_projection(xs...), FIT_FORWARD(Ts)(xs)...);
 #else
 #if FIT_NO_CONSTEXPR_VOID
         return
 #endif
-        detail::swallow{
+        fit::detail::swallow{
             (this->base_projection(xs...)(FIT_FORWARD(Ts)(xs)), 0)...
         };
 #endif

diff --git a/include/fit/conditional.hpp b/include/fit/conditional.hpp
@@ -173,7 +173,7 @@ struct conditional_kernel : compressed_pair<F1, F2>
     operator()(Ts && ... xs) const
     FIT_SFINAE_RETURNS
     (
-        detail::which(
+        fit::detail::which(
             FIT_RETURNS_CONSTRUCT(PickFirst)(),
             FIT_MANGLE_CAST(const F1&)(FIT_CONST_THIS->first(xs...)),
             FIT_MANGLE_CAST(const F2&)(FIT_CONST_THIS->second(xs...))

diff --git a/include/fit/detail/unpack_tuple.hpp b/include/fit/detail/unpack_tuple.hpp
@@ -74,7 +74,7 @@ struct unpack_sequence<std::tuple<Ts...>>
     template<class F, class S>
     constexpr static auto apply(F&& f, S&& t) FIT_RETURNS
     (
-        detail::unpack_tuple(FIT_FORWARD(F)(f), FIT_FORWARD(S)(t), detail::make_tuple_gens(t))
+        fit::detail::unpack_tuple(FIT_FORWARD(F)(f), FIT_FORWARD(S)(t), fit::detail::make_tuple_gens(t))
     );
 };
 

diff --git a/include/fit/fix.hpp b/include/fit/fix.hpp
@@ -146,7 +146,7 @@ struct fix_adaptor_base : F
     template<class... Ts>
     constexpr derived derived_function(Ts&&... xs) const noexcept
     {
-        return derived(detail::make_indirect_ref(this->base_function(xs...)));
+        return derived(fit::detail::make_indirect_ref(this->base_function(xs...)));
     }
 
     struct fix_failure

diff --git a/include/fit/is_unpackable.hpp b/include/fit/is_unpackable.hpp
@@ -61,7 +61,7 @@ struct unpack_impl_result
     static_assert(fit::is_callable<unpack_impl_f, decltype(fit::always(private_unpack_type())), Sequence>::value,
         "Unpack is invalid for this sequence. The function used to unpack this sequence is not callable."
     );
-    typedef decltype(detail::unpack_impl(fit::always(private_unpack_type()), std::declval<Sequence>())) type;
+    typedef decltype(fit::detail::unpack_impl(fit::always(private_unpack_type()), std::declval<Sequence>())) type;
 };
 
 template<class Sequence>

diff --git a/include/fit/pack.hpp b/include/fit/pack.hpp
@@ -197,7 +197,7 @@ struct pack_base<seq<Ns...>, Ts...>
     template<class F>
     constexpr auto operator()(F&& f) const FIT_RETURNS
     (
-        f(detail::pack_get<Ts, pack_tag<seq<Ns>, Ts...>>(*FIT_CONST_THIS, f)...)
+        f(fit::detail::pack_get<Ts, pack_tag<seq<Ns>, Ts...>>(*FIT_CONST_THIS, f)...)
     );
 
     typedef std::integral_constant<std::size_t, sizeof...(Ts)> fit_function_param_limit;
@@ -227,7 +227,7 @@ struct pack_base<seq<0>, T>
     template<class F>
     constexpr auto operator()(F&& f) const FIT_RETURNS
     (
-        f(detail::pack_get<T, pack_tag<seq<0>, T>>(*FIT_CONST_THIS, f))
+        f(fit::detail::pack_get<T, pack_tag<seq<0>, T>>(*FIT_CONST_THIS, f))
     );
 
     typedef std::integral_constant<std::size_t, 1> fit_function_param_limit;
@@ -260,7 +260,7 @@ struct pack_base<seq<Ns...>, Ts...>
     template<class F>
     constexpr auto operator()(F&& f) const FIT_RETURNS
     (
-        f(detail::pack_get<Ts, pack_tag<seq<Ns>, Ts...>>(*FIT_CONST_THIS, f)...)
+        f(fit::detail::pack_get<Ts, pack_tag<seq<Ns>, Ts...>>(*FIT_CONST_THIS, f)...)
     );
 
     typedef std::integral_constant<std::size_t, sizeof...(Ts)> fit_function_param_limit;
@@ -308,13 +308,13 @@ struct pack_join_base<pack_base<seq<Ns1...>, Ts1...>, pack_base<seq<Ns2...>, Ts2
     static constexpr result_type call(P1&& p1, P2&& p2)
     FIT_RETURNS_DEDUCE_NOEXCEPT(
         result_type(
-            detail::pack_get<Ts1, pack_tag<seq<Ns1>, Ts1...>>(FIT_FORWARD(P1)(p1))..., 
-            detail::pack_get<Ts2, pack_tag<seq<Ns2>, Ts2...>>(FIT_FORWARD(P2)(p2))...)
+            fit::detail::pack_get<Ts1, pack_tag<seq<Ns1>, Ts1...>>(FIT_FORWARD(P1)(p1))..., 
+            fit::detail::pack_get<Ts2, pack_tag<seq<Ns2>, Ts2...>>(FIT_FORWARD(P2)(p2))...)
     )
     {
         return result_type(
-            detail::pack_get<Ts1, pack_tag<seq<Ns1>, Ts1...>>(FIT_FORWARD(P1)(p1))..., 
-            detail::pack_get<Ts2, pack_tag<seq<Ns2>, Ts2...>>(FIT_FORWARD(P2)(p2))...);
+            fit::detail::pack_get<Ts1, pack_tag<seq<Ns1>, Ts1...>>(FIT_FORWARD(P1)(p1))..., 
+            fit::detail::pack_get<Ts2, pack_tag<seq<Ns2>, Ts2...>>(FIT_FORWARD(P2)(p2))...);
     }
 };
 

diff --git a/include/fit/unpack.hpp b/include/fit/unpack.hpp
@@ -122,15 +122,15 @@ struct unpack_adaptor : detail::callable_base<F>
             static auto deduce(T&& x)
             FIT_RETURNS
             (
-                detail::unpack_simple(deducer(), FIT_FORWARD(T)(x))
+                fit::detail::unpack_simple(deducer(), FIT_FORWARD(T)(x))
             );
 
             template<class T, class... Ts, class=typename std::enable_if<(
                 is_unpackable<T>::value && FIT_AND_UNPACK(is_unpackable<Ts>::value)
             )>::type>
             static auto deduce(T&& x, Ts&&... xs) FIT_RETURNS
             (
-                detail::unpack_join(deducer(), FIT_FORWARD(T)(x), FIT_FORWARD(Ts)(xs)...)
+                fit::detail::unpack_join(deducer(), FIT_FORWARD(T)(x), FIT_FORWARD(Ts)(xs)...)
             );
 #ifdef _MSC_VER
             template<class... Ts>
@@ -162,15 +162,15 @@ struct unpack_adaptor : detail::callable_base<F>
     constexpr auto operator()(T&& x) const
     FIT_RETURNS
     (
-        detail::unpack_simple(FIT_MANGLE_CAST(const detail::callable_base<F>&)(FIT_CONST_THIS->base_function(x)), FIT_FORWARD(T)(x))
+        fit::detail::unpack_simple(FIT_MANGLE_CAST(const detail::callable_base<F>&)(FIT_CONST_THIS->base_function(x)), FIT_FORWARD(T)(x))
     );
 
     template<class T, class... Ts, class=typename std::enable_if<(
         is_unpackable<T>::value && FIT_AND_UNPACK(is_unpackable<Ts>::value)
     )>::type>
     constexpr auto operator()(T&& x, Ts&&... xs) const FIT_RETURNS
     (
-        detail::unpack_join(FIT_MANGLE_CAST(const detail::callable_base<F>&)(FIT_CONST_THIS->base_function(x)), FIT_FORWARD(T)(x), FIT_FORWARD(Ts)(xs)...)
+        fit::detail::unpack_join(FIT_MANGLE_CAST(const detail::callable_base<F>&)(FIT_CONST_THIS->base_function(x)), FIT_FORWARD(T)(x), FIT_FORWARD(Ts)(xs)...)
     );
 };