Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Возможность компиляции в C++17 #128

Merged
merged 1 commit into from
Jul 25, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions include/burst/container/k_ary_search_set.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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()
);

Expand All @@ -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())
{
Expand Down
2 changes: 1 addition & 1 deletion include/burst/functional/non_strict.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ namespace burst
template <typename BinaryPredicate>
auto non_strict (BinaryPredicate && strict_order)
{
return not_fn(invert(std::forward<BinaryPredicate>(strict_order)));
return burst::not_fn(invert(std::forward<BinaryPredicate>(strict_order)));
}
}

Expand Down
6 changes: 3 additions & 3 deletions include/burst/functional/part.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,21 +24,21 @@ namespace burst
template <typename ... As>
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>(as)...)));
}

template <typename ... As>
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>(as)...)));
}

template <typename ... As>
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>(as)...)));
}

Expand Down
2 changes: 1 addition & 1 deletion include/burst/range/adaptor/adaptor.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ namespace burst
auto operator | (Range && range, adaptor_compare_forwarder_t<Adaptor, Tuple> forwarder)
{
return
apply
burst::apply
(
forwarder.adaptor,
std::tuple_cat
Expand Down
6 changes: 3 additions & 3 deletions include/burst/tuple/apply.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,19 +34,19 @@ namespace burst
template <typename Tuple>
constexpr decltype(auto) operator () (Tuple && t) const &
{
return apply(f, std::forward<Tuple>(t));
return burst::apply(f, std::forward<Tuple>(t));
}

template <typename Tuple>
constexpr decltype(auto) operator () (Tuple && t) &
{
return apply(f, std::forward<Tuple>(t));
return burst::apply(f, std::forward<Tuple>(t));
}

template <typename Tuple>
constexpr decltype(auto) operator () (Tuple && t) &&
{
return apply(std::move(f), std::forward<Tuple>(t));
return burst::apply(std::move(f), std::forward<Tuple>(t));
}

NaryFunction f;
Expand Down
2 changes: 1 addition & 1 deletion include/burst/tuple/forward_tuple.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ namespace burst
template <typename T>
constexpr decltype(auto) operator () (T && t) const
{
return apply(forward_as_tuple, std::forward<T>(t));
return burst::apply(forward_as_tuple, std::forward<T>(t));
}
};

Expand Down