diff --git a/include/burst/container/k_ary_search_set.hpp b/include/burst/container/k_ary_search_set.hpp index 3fe00b34..97d682b7 100644 --- a/include/burst/container/k_ary_search_set.hpp +++ b/include/burst/container/k_ary_search_set.hpp @@ -289,7 +289,7 @@ namespace burst void initialize (const RandomAccessRange & range) { const auto is_sorted_and_unique = - std::adjacent_find(range.begin(), range.end(), not_fn(m_compare)) == range.end(); + std::adjacent_find(range.begin(), range.end(), burst::not_fn(m_compare)) == range.end(); if (is_sorted_and_unique) { initialize_trusted(range); @@ -300,7 +300,7 @@ namespace burst std::sort(buffer.begin(), buffer.end(), m_compare); buffer.erase ( - std::unique(buffer.begin(), buffer.end(), not_fn(m_compare)), + std::unique(buffer.begin(), buffer.end(), burst::not_fn(m_compare)), buffer.end() ); @@ -325,7 +325,7 @@ namespace burst { BOOST_ASSERT ( - std::adjacent_find(range.begin(), range.end(), not_fn(m_compare)) == range.end() + std::adjacent_find(range.begin(), range.end(), burst::not_fn(m_compare)) == range.end() ); if (not range.empty()) { diff --git a/include/burst/functional/non_strict.hpp b/include/burst/functional/non_strict.hpp index b9a97344..ebdd084d 100644 --- a/include/burst/functional/non_strict.hpp +++ b/include/burst/functional/non_strict.hpp @@ -15,7 +15,7 @@ namespace burst template auto non_strict (BinaryPredicate && strict_order) { - return not_fn(invert(std::forward(strict_order))); + return burst::not_fn(invert(std::forward(strict_order))); } } diff --git a/include/burst/functional/part.hpp b/include/burst/functional/part.hpp index c64e23b1..f96b7968 100644 --- a/include/burst/functional/part.hpp +++ b/include/burst/functional/part.hpp @@ -24,21 +24,21 @@ namespace burst template constexpr decltype(auto) operator () (As && ... as) const & { - return apply(invoke, + return burst::apply(invoke, std::tuple_cat(forward_tuple(t), std::forward_as_tuple(std::forward(as)...))); } template constexpr decltype(auto) operator () (As && ... as) & { - return apply(invoke, + return burst::apply(invoke, std::tuple_cat(forward_tuple(t), std::forward_as_tuple(std::forward(as)...))); } template constexpr decltype(auto) operator () (As && ... as) && { - return apply(invoke, + return burst::apply(invoke, std::tuple_cat(forward_tuple(std::move(t)), std::forward_as_tuple(std::forward(as)...))); } diff --git a/include/burst/range/adaptor/adaptor.hpp b/include/burst/range/adaptor/adaptor.hpp index c47c4b9b..cca0e2b2 100644 --- a/include/burst/range/adaptor/adaptor.hpp +++ b/include/burst/range/adaptor/adaptor.hpp @@ -56,7 +56,7 @@ namespace burst auto operator | (Range && range, adaptor_compare_forwarder_t forwarder) { return - apply + burst::apply ( forwarder.adaptor, std::tuple_cat diff --git a/include/burst/tuple/apply.hpp b/include/burst/tuple/apply.hpp index 6117263e..4746b591 100644 --- a/include/burst/tuple/apply.hpp +++ b/include/burst/tuple/apply.hpp @@ -34,19 +34,19 @@ namespace burst template constexpr decltype(auto) operator () (Tuple && t) const & { - return apply(f, std::forward(t)); + return burst::apply(f, std::forward(t)); } template constexpr decltype(auto) operator () (Tuple && t) & { - return apply(f, std::forward(t)); + return burst::apply(f, std::forward(t)); } template constexpr decltype(auto) operator () (Tuple && t) && { - return apply(std::move(f), std::forward(t)); + return burst::apply(std::move(f), std::forward(t)); } NaryFunction f; diff --git a/include/burst/tuple/forward_tuple.hpp b/include/burst/tuple/forward_tuple.hpp index 59e8d045..04cde7ea 100644 --- a/include/burst/tuple/forward_tuple.hpp +++ b/include/burst/tuple/forward_tuple.hpp @@ -24,7 +24,7 @@ namespace burst template constexpr decltype(auto) operator () (T && t) const { - return apply(forward_as_tuple, std::forward(t)); + return burst::apply(forward_as_tuple, std::forward(t)); } };