Skip to content

Commit 2fcacf3

Browse files
committed
[container.node] Remove placeholder class name from subheadings.
Partially addresses #1242.
1 parent 87ae756 commit 2fcacf3

File tree

1 file changed

+47
-42
lines changed

1 file changed

+47
-42
lines changed

source/containers.tex

+47-42
Original file line numberDiff line numberDiff line change
@@ -1199,10 +1199,10 @@
11991199

12001200
\rSec2[container.node]{Node handles}
12011201

1202-
\rSec3[container.node.overview]{\tcode{node_handle} overview}
1202+
\rSec3[container.node.overview]{Overview}
12031203

12041204
\pnum
1205-
A \term{node handle} is an object that accepts ownership of a single element
1205+
A \defn{node handle} is an object that accepts ownership of a single element
12061206
from an associative container\iref{associative.reqmts} or an unordered
12071207
associative container\iref{unord.req}. It may be used to transfer that
12081208
ownership to another container with compatible nodes. Containers with
@@ -1249,46 +1249,51 @@
12491249

12501250
\begin{codeblock}
12511251
template<@\unspecnc@>
1252-
class @\placeholder{node_handle}@ {
1253-
public:
1254-
// These type declarations are described in Tables \ref{tab:containers.associative.requirements} and \ref{tab:HashRequirements}.
1255-
using value_type = @\seebelownc{}@; // not present for map containers
1256-
using key_type = @\seebelownc{}@; // not present for set containers
1257-
using mapped_type = @\seebelownc{}@; // not present for set containers
1258-
using allocator_type = @\seebelownc{}@;
1259-
1260-
private:
1261-
using container_node_type = @\unspecnc@;
1262-
using ator_traits = allocator_traits<allocator_type>;
1263-
1264-
typename ator_traits::rebind_traits<container_node_type>::pointer ptr_;
1265-
optional<allocator_type> alloc_;
1266-
1267-
public:
1268-
constexpr @\placeholdernc{node_handle}@() noexcept : ptr_(), alloc_() {}
1269-
~@\placeholdernc{node_handle}@();
1270-
@\placeholdernc{node_handle}@(@\placeholdernc{node_handle}@&&) noexcept;
1271-
@\placeholdernc{node_handle}@& operator=(@\placeholdernc{node_handle}@&&);
1272-
1273-
value_type& value() const; // not present for map containers
1274-
key_type& key() const; // not present for set containers
1275-
mapped_type& mapped() const; // not present for set containers
1276-
1277-
allocator_type get_allocator() const;
1278-
explicit operator bool() const noexcept;
1279-
[[nodiscard]] bool empty() const noexcept;
1280-
1281-
void swap(@\placeholdernc{node_handle}@&)
1282-
noexcept(ator_traits::propagate_on_container_swap::value ||
1283-
ator_traits::is_always_equal::value);
1284-
1285-
friend void swap(@\placeholdernc{node_handle}@& x, @\placeholdernc{node_handle}@& y) noexcept(noexcept(x.swap(y))) {
1286-
x.swap(y);
1287-
}
1252+
class @\placeholder{node_handle}@ {
1253+
public:
1254+
// These type declarations are described in Tables \ref{tab:containers.associative.requirements} and \ref{tab:HashRequirements}.
1255+
using value_type = @\seebelownc{}@; // not present for map containers
1256+
using key_type = @\seebelownc{}@; // not present for set containers
1257+
using mapped_type = @\seebelownc{}@; // not present for set containers
1258+
using allocator_type = @\seebelownc{}@;
1259+
1260+
private:
1261+
using container_node_type = @\unspecnc@;
1262+
using ator_traits = allocator_traits<allocator_type>;
1263+
1264+
typename ator_traits::rebind_traits<container_node_type>::pointer ptr_;
1265+
optional<allocator_type> alloc_;
1266+
1267+
public:
1268+
// \ref{container.node.cons}, constructors, copy, and assignment
1269+
constexpr @\placeholdernc{node_handle}@() noexcept : ptr_(), alloc_() {}
1270+
@\placeholdernc{node_handle}@(@\placeholdernc{node_handle}@&&) noexcept;
1271+
@\placeholdernc{node_handle}@& operator=(@\placeholdernc{node_handle}@&&);
1272+
1273+
// \ref{container.node.dtor}, destructor
1274+
~@\placeholdernc{node_handle}@();
1275+
1276+
// \ref{container.node.observers}, observers
1277+
value_type& value() const; // not present for map containers
1278+
key_type& key() const; // not present for set containers
1279+
mapped_type& mapped() const; // not present for set containers
1280+
1281+
allocator_type get_allocator() const;
1282+
explicit operator bool() const noexcept;
1283+
[[nodiscard]] bool empty() const noexcept;
1284+
1285+
// \ref{container.node.modifiers}, modifiers
1286+
void swap(@\placeholdernc{node_handle}@&)
1287+
noexcept(ator_traits::propagate_on_container_swap::value ||
1288+
ator_traits::is_always_equal::value);
1289+
1290+
friend void swap(@\placeholdernc{node_handle}@& x, @\placeholdernc{node_handle}@& y) noexcept(noexcept(x.swap(y))) {
1291+
x.swap(y);
1292+
}
12881293
};
12891294
\end{codeblock}
12901295

1291-
\rSec3[container.node.cons]{\tcode{\placeholder{node_handle}} constructors, copy, and assignment}
1296+
\rSec3[container.node.cons]{Constructors, copy, and assignment}
12921297

12931298
\begin{itemdecl}
12941299
@\placeholdernc{node_handle}@(@\placeholdernc{node_handle}@&& nh) noexcept;
@@ -1336,7 +1341,7 @@
13361341
\pnum \throws Nothing.
13371342
\end{itemdescr}
13381343

1339-
\rSec3[container.node.dtor]{\tcode{\placeholder{node_handle}} destructor}
1344+
\rSec3[container.node.dtor]{Destructor}
13401345

13411346
\begin{itemdecl}
13421347
~@\placeholdernc{node_handle}@();
@@ -1350,7 +1355,7 @@
13501355
\tcode{ator_traits::rebind_traits<container_node_type>::deallocate}.
13511356
\end{itemdescr}
13521357

1353-
\rSec3[container.node.observers]{\tcode{\placeholder{node_handle}} observers}
1358+
\rSec3[container.node.observers]{Observers}
13541359

13551360
\begin{itemdecl}
13561361
value_type& value() const;
@@ -1439,7 +1444,7 @@
14391444
\returns \tcode{ptr_ == nullptr}.
14401445
\end{itemdescr}
14411446

1442-
\rSec3[container.node.modifiers]{\tcode{\placeholder{node_handle}} modifiers}
1447+
\rSec3[container.node.modifiers]{Modifiers}
14431448

14441449
\begin{itemdecl}
14451450
void swap(@\placeholdernc{node_handle}@& nh)

0 commit comments

Comments
 (0)