Skip to content

Commit 891797c

Browse files
committed
Flatten redlines in preparation for post-Rapperswil mailing
1 parent d38eceb commit 891797c

File tree

7 files changed

+274
-883
lines changed

7 files changed

+274
-883
lines changed

algorithms.html

Lines changed: 84 additions & 238 deletions
Large diffs are not rendered by default.

exceptions.html

Lines changed: 14 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ <h1>Parallel exceptions</h1>
33
<cxx-section id="parallel.exceptions.behavior">
44
<h1>Exception reporting behavior</h1>
55
<p>
6-
<ins2>During the execution of a standard parallel algorithm, </ins2>
7-
<del2>I</del2><ins2>i</ins2>f temporary memory resources are required <del2>by the algorithm</del2> and none are available,
6+
During the execution of a standard parallel algorithm,
7+
if temporary memory resources are required and none are available,
88
the algorithm throws a <code>std::bad_alloc</code> exception.
99
</p>
1010
<p>
@@ -14,7 +14,7 @@ <h1>Exception reporting behavior</h1>
1414

1515
<ul>
1616
<li>
17-
If the execution policy object is of type <code>class <del2>vector_execution_policy</del2><ins2>parallel_vector_execution_policy</ins2></code>,
17+
If the execution policy object is of type <code>class parallel_vector_execution_policy</code>,
1818
<code>std::terminate</code> shall be called.
1919
</li>
2020
<li>
@@ -59,41 +59,28 @@ <h1>Header <code>&lt;experimental/exception_list&gt;</code> synopsis</h1>
5959
namespace std {
6060
namespace experimental {
6161
namespace parallel {
62-
<ins2>inline namespace v1 {</ins2>
62+
inline namespace v1 {
6363

6464
class exception_list : public exception
6565
{
6666
public:
67-
<del2>
68-
typedef exception_ptr value_type;
69-
typedef const value_type&amp; reference;
70-
typedef const value_type&amp; const_reference;
71-
typedef <em>implementation-defined</em> const_iterator;
72-
typedef const_iterator iterator;
73-
typedef typename iterator_traits<ins2>&lt;const_iterator&gt;</ins2>::difference_type difference_type;
74-
typedef size_t size_type;</del2>
75-
<ins2>
76-
typedef <em>unspecified</em> iterator;</ins2>
67+
typedef <em>unspecified</em> iterator;
7768

7869
size_t size() const noexcept;
7970
iterator begin() const noexcept;
8071
iterator end() const noexcept;
8172

82-
<ins2>const char* what() const override noexcept;</ins2>
83-
<del2>
84-
private:
85-
std::list&lt;exception_ptr&gt; exceptions_; // exposition only
86-
</del2>
73+
const char* what() const override noexcept;
8774
};
88-
<ins2>}</ins2>
75+
}
8976
}
9077
}
9178
}
9279
</pre>
9380

9481
<p>
95-
The class <code>exception_list</code> <del2>is a container</del2> <ins2>owns a sequence</ins2> of <code>exception_ptr</code> objects <ins2>.The</ins2> parallel
96-
algorithms may use <ins2>the <code>exception_list</code></ins2> to communicate uncaught exceptions encountered during parallel execution to the
82+
The class <code>exception_list</code> owns a sequence of <code>exception_ptr</code> objects. The parallel
83+
algorithms may use the <code>exception_list</code> to communicate uncaught exceptions encountered during parallel execution to the
9784
caller of the algorithm.
9885
</p>
9986

@@ -118,7 +105,7 @@ <h1>Header <code>&lt;experimental/exception_list&gt;</code> synopsis</h1>
118105

119106
<cxx-function>
120107
<cxx-signature>
121-
<del2>exception_list::</del2>iterator begin() const noexcept;
108+
iterator begin() const noexcept;
122109
</cxx-signature>
123110

124111
<cxx-returns>
@@ -128,21 +115,21 @@ <h1>Header <code>&lt;experimental/exception_list&gt;</code> synopsis</h1>
128115

129116
<cxx-function>
130117
<cxx-signature>
131-
<del2>exception_list::</del2>iterator end() const noexcept;
118+
iterator end() const noexcept;
132119
</cxx-signature>
133120

134121
<cxx-returns>
135-
An iterator <del2>which is the past-the-end value for the <code>exception_list</code></del2> <ins2>that is past the end of the owned sequence.</ins2>
122+
An iterator that is past the end of the owned sequence.
136123
</cxx-returns>
137124
</cxx-function>
138125

139126
<cxx-function>
140127
<cxx-signature>
141-
<ins2>const char* what() const noexcept;</ins2>
128+
const char* what() const noexcept;
142129
</cxx-signature>
143130

144131
<cxx-returns>
145-
<ins2>An implementation-defined NTBS.</ins2>
132+
An implementation-defined NTBS.
146133
</cxx-returns>
147134
</cxx-function>
148135
</cxx-section>

0 commit comments

Comments
 (0)