Merge pull request #722 from tkruse/fix-text

Fix text mistake
This commit is contained in:
Gabriel Dos Reis 2016-09-06 02:47:26 -07:00 committed by GitHub
commit fdc4a6df04

View File

@ -11280,7 +11280,7 @@ Consider:
template <class ForwardIterator, class T> template <class ForwardIterator, class T>
bool binary_search(ForwardIterator first, ForwardIterator last, const T& val); bool binary_search(ForwardIterator first, ForwardIterator last, const T& val);
`binary_search(begin(c),end(c),7)` will tell you whether `7` is in `c` or not. `binary_search(begin(c) ,end(c) ,7)` will tell you whether `7` is in `c` or not.
However, it will not tell you where that `7` is or whether there are more than one `7`. However, it will not tell you where that `7` is or whether there are more than one `7`.
Sometimes, just passing the minimal amount of information back (here, `true` or `false`) is sufficient, but a good interface passes Sometimes, just passing the minimal amount of information back (here, `true` or `false`) is sufficient, but a good interface passes
@ -11299,7 +11299,7 @@ However, `lower_bound` still doesn't return enough information for all uses, so
`equal_range` returns a `pair` of iterators specifying the first and one beyond last match. `equal_range` returns a `pair` of iterators specifying the first and one beyond last match.
auto r = equal_range(begin(c), end(c),7); auto r = equal_range(begin(c), end(c) ,7);
for (auto p = r.first(); p != r.second(), ++p) for (auto p = r.first(); p != r.second(), ++p)
cout << *p << '\n'; cout << *p << '\n';
@ -11514,7 +11514,10 @@ There are several ways that this example could be made safe for a multi-threaded
* Refuse to build and/or run in a multi-threaded environment. * Refuse to build and/or run in a multi-threaded environment.
* Provide two implementations, one which is used in single-threaded environments and another which is used in multi-threaded environments. * Provide two implementations, one which is used in single-threaded environments and another which is used in multi-threaded environments.
Code that is never run in a multi-threaded environment. ##### Exception
Code that is never run in a multi-threaded environment.
Be careful: there are many examples where code that was "known" to never run in a multi-threaded program Be careful: there are many examples where code that was "known" to never run in a multi-threaded program
was run as part of a multi-threaded program. Often years later. was run as part of a multi-threaded program. Often years later.
Typically, such programs lead to a painful effort to remove data races. Typically, such programs lead to a painful effort to remove data races.