[associative.reqmts.general]

Files changed (1) hide show

tmp/tmp7w8nb6h9/{from.md → to.md} +16 -17

tmp/tmp7w8nb6h9/{from.md → to.md} RENAMED Viewed

@@ -52,14 +52,14 @@ In this subclause,
 - `X` denotes an associative container class,
 - `a` denotes a value of type `X`,
 - `a2` denotes a value of a type with nodes compatible with type `X` (
   [[container.node.compat]]),
-- `b` denotes a value or type `X` or `const X`,
 - `u` denotes the name of a variable being declared,
 - `a_uniq` denotes a value of type `X` when `X` supports unique keys,
-- `a_eq` denotes a value of type `X` when `X` supports multiple keys,
 - `a_tran` denotes a value of type `X` or `const X` when the
   *qualified-id* `X::key_compare::is_transparent` is valid and denotes a
   type [[temp.deduct]],
 - `i` and `j` meet the *Cpp17InputIterator* requirements and refer to
   elements implicitly convertible to `value_type`,
@@ -67,11 +67,11 @@ In this subclause,
 - `rg` denotes a value of a type `R` that models
   `container-compatible-range<value_type>`,
 - `p` denotes a valid constant iterator to `a`,
 - `q` denotes a valid dereferenceable constant iterator to `a`,
 - `r` denotes a valid dereferenceable iterator to `a`,
-- `[q1, q2)` denotes a valid range of constant iterators in `a`,
 - `il` designates an object of type `initializer_list<value_type>`,
 - `t` denotes a value of type `X::value_type`,
 - `k` denotes a value of type `X::key_type`, and
 - `c` denotes a value of type `X::key_compare` or
   `const X::key_compare`;
@@ -93,19 +93,18 @@ In this subclause,
 - `m` denotes an allocator of a type convertible to `A`, and `nh`
   denotes a non-const rvalue of type `X::node_type`.
 A type `X` meets the *associative container* requirements if `X` meets
 all the requirements of an allocator-aware container
-[[container.requirements.general]] and the following types, statements,
-and expressions are well-formed and have the specified semantics, except
 that for `map` and `multimap`, the requirements placed on `value_type`
-in [[container.alloc.reqmts]] apply instead to `key_type` and
-`mapped_type`.
-[*Note 3*: For example, in some cases `key_type` and `mapped_type` are
-required to be *Cpp17CopyAssignable* even though the associated
-`value_type`, `pair<const key_type, mapped_type>`, is not
 *Cpp17CopyAssignable*. — *end note*]
 ``` cpp
 typename X::key_type
 ```
@@ -324,12 +323,11 @@ a.emplace_hint(p, args)
 *Effects:* Equivalent to `a.emplace(std::forward<Args>(args)...)`,
 except that the element is inserted as close as possible to the position
 just prior to `p`.
-*Returns:* An iterator pointing to the element with the key equivalent
-to the newly inserted element.
 *Complexity:* Logarithmic in general, but amortized constant if the
 element is inserted right before `p`.
 ``` cpp
@@ -538,21 +536,22 @@ a.extract(q)
 a.merge(a2)
 ```
 *Result:* `void`
-*Preconditions:* `a.get_allocator() == a2.get_allocator()`.
 *Effects:* Attempts to extract each element in `a2` and insert it into
 `a` using the comparison object of `a`. In containers with unique keys,
 if there is an element in `a` with key equivalent to the key of an
 element from `a2`, then that element is not extracted from `a2`.
 *Ensures:* Pointers and references to the transferred elements of `a2`
-refer to those same elements but as members of `a`. Iterators referring
-to the transferred elements will continue to refer to their elements,
-but they now behave as iterators into `a`, not into `a2`.
 *Throws:* Nothing unless the comparison object throws.
 *Complexity:* N log(`a.size()+` N), where N has the value `a2.size()`.
@@ -724,11 +723,11 @@ b.upper_bound(k)
 *Result:* `iterator`; `const_iterator` for constant `b`.
 *Returns:* An iterator pointing to the first element with key greater
 than `k`, or `b.end()` if such an element is not found.
-*Complexity:* Logarithmic,
 ``` cpp
 a_tran.upper_bound(ku)
 ```

 - `X` denotes an associative container class,
 - `a` denotes a value of type `X`,
 - `a2` denotes a value of a type with nodes compatible with type `X` (
   [[container.node.compat]]),
+- `b` denotes a value of type `X` or `const X`,
 - `u` denotes the name of a variable being declared,
 - `a_uniq` denotes a value of type `X` when `X` supports unique keys,
+- `a_eq` denotes a value of type `X` when `X` supports equivalent keys,
 - `a_tran` denotes a value of type `X` or `const X` when the
   *qualified-id* `X::key_compare::is_transparent` is valid and denotes a
   type [[temp.deduct]],
 - `i` and `j` meet the *Cpp17InputIterator* requirements and refer to
   elements implicitly convertible to `value_type`,
 - `rg` denotes a value of a type `R` that models
   `container-compatible-range<value_type>`,
 - `p` denotes a valid constant iterator to `a`,
 - `q` denotes a valid dereferenceable constant iterator to `a`,
 - `r` denotes a valid dereferenceable iterator to `a`,
+- \[`q1`, `q2`) denotes a valid range of constant iterators in `a`,
 - `il` designates an object of type `initializer_list<value_type>`,
 - `t` denotes a value of type `X::value_type`,
 - `k` denotes a value of type `X::key_type`, and
 - `c` denotes a value of type `X::key_compare` or
   `const X::key_compare`;
 - `m` denotes an allocator of a type convertible to `A`, and `nh`
   denotes a non-const rvalue of type `X::node_type`.
 A type `X` meets the *associative container* requirements if `X` meets
 all the requirements of an allocator-aware container
+[[container.alloc.reqmts]] and the following types, statements, and
+expressions are well-formed and have the specified semantics, except
 that for `map` and `multimap`, the requirements placed on `value_type`
+in [[container.reqmts]] apply instead to `key_type` and `mapped_type`.
+[*Note 3*: For example, in some cases `key_type` and `mapped_type` need
+to be *Cpp17CopyAssignable* even though the associated `value_type`,
+`pair<const key_type, mapped_type>`, is not
 *Cpp17CopyAssignable*. — *end note*]
 ``` cpp
 typename X::key_type
 ```
 *Effects:* Equivalent to `a.emplace(std::forward<Args>(args)...)`,
 except that the element is inserted as close as possible to the position
 just prior to `p`.
+*Returns:* The iterator returned by `emplace`.
 *Complexity:* Logarithmic in general, but amortized constant if the
 element is inserted right before `p`.
 ``` cpp
 a.merge(a2)
 ```
 *Result:* `void`
+*Preconditions:* `a.get_allocator() == a2.get_allocator()` is `true`.
 *Effects:* Attempts to extract each element in `a2` and insert it into
 `a` using the comparison object of `a`. In containers with unique keys,
 if there is an element in `a` with key equivalent to the key of an
 element from `a2`, then that element is not extracted from `a2`.
 *Ensures:* Pointers and references to the transferred elements of `a2`
+refer to those same elements but as members of `a`. If `a.begin()` and
+`a2.begin()` have the same type, iterators referring to the transferred
+elements will continue to refer to their elements, but they now behave
+as iterators into `a`, not into `a2`.
 *Throws:* Nothing unless the comparison object throws.
 *Complexity:* N log(`a.size()+` N), where N has the value `a2.size()`.
 *Result:* `iterator`; `const_iterator` for constant `b`.
 *Returns:* An iterator pointing to the first element with key greater
 than `k`, or `b.end()` if such an element is not found.
+*Complexity:* Logarithmic.
 ``` cpp
 a_tran.upper_bound(ku)
 ```

Diff to HTML by rtfpessoa