|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r76144 - in trunk/libs: iostreams/doc/classes iostreams/doc/functions unordered/test/helpers
From: dnljms_at_[hidden]
Date: 2011-12-24 14:00:09
Author: danieljames
Date: 2011-12-24 14:00:08 EST (Sat, 24 Dec 2011)
New Revision: 76144
URL: http://svn.boost.org/trac/boost/changeset/76144
Log:
Fix 'occurred' in iostreams and unordered. Refs #6003
Text files modified:
trunk/libs/iostreams/doc/classes/gzip.html | 2 +-
trunk/libs/iostreams/doc/functions/flush.html | 2 +-
trunk/libs/unordered/test/helpers/invariants.hpp | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
Modified: trunk/libs/iostreams/doc/classes/gzip.html
==============================================================================
--- trunk/libs/iostreams/doc/classes/gzip.html (original)
+++ trunk/libs/iostreams/doc/classes/gzip.html 2011-12-24 14:00:08 EST (Sat, 24 Dec 2011)
@@ -104,7 +104,7 @@
<TR><TH>Constant</TH><TH>Interpretation</TH></TR>
<TR>
<TD VALIGN="top"><A NAME="zlib_error"></A><CODE>zlib_error</CODE></TD>
- <TD>A zlib error has occured; use gzip_error::zlib_error_code
to obtain an error code.</TD>
+ <TD>A zlib error has occurred; use gzip_error::zlib_error_code
to obtain an error code.</TD>
</TR>
<TR>
<TD VALIGN="top"><A NAME="bad_crc"></A><CODE>bad_crc</CODE></TD>
Modified: trunk/libs/iostreams/doc/functions/flush.html
==============================================================================
--- trunk/libs/iostreams/doc/functions/flush.html (original)
+++ trunk/libs/iostreams/doc/functions/flush.html 2011-12-24 14:00:08 EST (Sat, 24 Dec 2011)
@@ -27,7 +27,7 @@
The function template <CODE>flush</CODE> attemps to flush all buffered characters downstream. It is provided to facilite modifiying a filter chain in the middle of a sequence of output operations; specifically, it is used to implement the function <CODE>strict_sync</CODE> (<I>see</I>, <I>e.g.</I>, <A HREF='../classes/filtering_stream.html#strict_sync'><CODE>filtering_stream::strict_sync</CODE></A>). If <CODE>strict_sync</CODE> succeeds, the auto-close feature of a filter chain can be safely disabled using <CODE>set_auto_close(false)</CODE> (<I>see</I>, <I>e.g.</I>, <A HREF='../classes/filtering_stream.html#set_auto_close'><CODE>filtering_stream::set_auto_close</CODE></A>). Filters can then be added to or removed from the chain with the knowledge that no characters remain buffered.
</P>
<P>
- For non-<A HREF='../concepts/flushable.html'>Flushable</A> devices, <CODE>flush</CODE> returns <CODE>true</CODE>, indicating that no error has occured.<A CLASS='footnote_ref' NAME='note_1_ref' HREF="#note_1"><SUP>[1]</SUP></A> For non-<A HREF='../concepts/flushable.html'>Flushable</A> filters, however, <CODE>flush</CODE> returns <CODE>false</CODE>, indicating that some characters may remain buffered.
+ For non-<A HREF='../concepts/flushable.html'>Flushable</A> devices, <CODE>flush</CODE> returns <CODE>true</CODE>, indicating that no error has occurred.<A CLASS='footnote_ref' NAME='note_1_ref' HREF="#note_1"><SUP>[1]</SUP></A> For non-<A HREF='../concepts/flushable.html'>Flushable</A> filters, however, <CODE>flush</CODE> returns <CODE>false</CODE>, indicating that some characters may remain buffered.
</P>
<P>
When working with Devices, <CODE>flush</CODE> may be used as a generic version of <CODE>std::basic_ostream::flush()</CODE>.
Modified: trunk/libs/unordered/test/helpers/invariants.hpp
==============================================================================
--- trunk/libs/unordered/test/helpers/invariants.hpp (original)
+++ trunk/libs/unordered/test/helpers/invariants.hpp 2011-12-24 14:00:08 EST (Sat, 24 Dec 2011)
@@ -38,7 +38,7 @@
it = x1.begin(), end = x1.end();
BOOST_DEDUCED_TYPENAME X::size_type size = 0;
while(it != end) {
- // First test that the current key has not occured before, required
+ // First test that the current key has not occurred before, required
// to test either that keys are unique or that equivalent keys are
// adjacent. (6.3.1/6)
key_type key = get_key<X>(*it);
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk