Skip to content

Fix placement of namespace-scope declarations #5396

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Aug 22, 2022
Merged

Fix placement of namespace-scope declarations #5396

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0ea41fc
[atomics.syn] Move namespace-scope memory_order_* variables here
jensmaurer Apr 17, 2022
e1d39bc
[ranges.syn] Move namespace-scope declarations for get(subrange) here
jensmaurer Apr 17, 2022
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
26 changes: 14 additions & 12 deletions source/ranges.tex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,20 @@
template<class I, class S, subrange_kind K>
inline constexpr bool enable_borrowed_range<subrange<I, S, K>> = true; // freestanding

template<size_t N, class I, class S, subrange_kind K>
requires ((N == 0 && @\libconcept{copyable}@<I>) || N == 1)
constexpr auto get(const subrange<I, S, K>& r);

template<size_t N, class I, class S, subrange_kind K>
requires (N < 2)
constexpr auto get(subrange<I, S, K>&& r);
}

namespace std {
using ranges::get;
}

namespace std::ranges {
// \ref{range.dangling}, dangling iterator handling
struct dangling; // freestanding

Expand Down Expand Up @@ -1880,18 +1894,6 @@
template<@\libconcept{borrowed_range}@ R>
subrange(R&&, @\placeholdernc{make-unsigned-like-t}@<range_difference_t<R>>) ->
subrange<iterator_t<R>, sentinel_t<R>, subrange_kind::sized>;

template<size_t N, class I, class S, subrange_kind K>
requires ((N == 0 && @\libconcept{copyable}@<I>) || N == 1)
constexpr auto get(const subrange<I, S, K>& r);

template<size_t N, class I, class S, subrange_kind K>
requires (N < 2)
constexpr auto get(subrange<I, S, K>&& r);
}

namespace std {
using ranges::get;
}
\end{codeblock}

Expand Down
13 changes: 7 additions & 6 deletions source/threads.tex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2049,6 +2049,13 @@
namespace std {
// \ref{atomics.order}, order and consistency
enum class memory_order : @\unspec@; // freestanding
inline constexpr memory_order memory_order_relaxed = memory_order::relaxed;
inline constexpr memory_order memory_order_consume = memory_order::consume;
inline constexpr memory_order memory_order_acquire = memory_order::acquire;
inline constexpr memory_order memory_order_release = memory_order::release;
inline constexpr memory_order memory_order_acq_rel = memory_order::acq_rel;
inline constexpr memory_order memory_order_seq_cst = memory_order::seq_cst;

template<class T>
T kill_dependency(T y) noexcept; // freestanding
}
Expand Down Expand Up @@ -2415,12 +2422,6 @@
enum class memory_order : @\unspec@ {
relaxed, consume, acquire, release, acq_rel, seq_cst
};
inline constexpr memory_order memory_order_relaxed = memory_order::relaxed;
inline constexpr memory_order memory_order_consume = memory_order::consume;
inline constexpr memory_order memory_order_acquire = memory_order::acquire;
inline constexpr memory_order memory_order_release = memory_order::release;
inline constexpr memory_order memory_order_acq_rel = memory_order::acq_rel;
inline constexpr memory_order memory_order_seq_cst = memory_order::seq_cst;
}
\end{codeblock}

Expand Down