|
Boost-Commit : |
From: technews_at_[hidden]
Date: 2008-03-03 02:02:14
Author: turkanis
Date: 2008-03-03 02:02:13 EST (Mon, 03 Mar 2008)
New Revision: 43460
URL: http://svn.boost.org/trac/boost/changeset/43460
Log:
full merge from trunk at 43458
Added:
branches/release/libs/iostreams/doc/release_notes.html
- copied unchanged from r43458, /trunk/libs/iostreams/doc/release_notes.html
Text files modified:
branches/release/libs/iostreams/doc/concepts/output_filter.html | 2 +-
branches/release/libs/iostreams/doc/installation.html | 2 +-
branches/release/libs/iostreams/doc/portability.html | 2 +-
branches/release/libs/iostreams/doc/tutorial/container_sink.html | 6 +++---
branches/release/libs/iostreams/doc/tutorial/writing_devices.html | 4 ++--
5 files changed, 8 insertions(+), 8 deletions(-)
Modified: branches/release/libs/iostreams/doc/concepts/output_filter.html
==============================================================================
--- branches/release/libs/iostreams/doc/concepts/output_filter.html (original)
+++ branches/release/libs/iostreams/doc/concepts/output_filter.html 2008-03-03 02:02:13 EST (Mon, 03 Mar 2008)
@@ -66,7 +66,7 @@
<SPAN CLASS="keyword">template</SPAN><<SPAN CLASS="keyword">typename</SPAN> Sink>
<SPAN CLASS="keyword">bool</SPAN> put(Sink& snk, <SPAN CLASS="keyword">char</SPAN> c)
{
- <SPAN CLASS="keyword">return</SPAN> io:put(snk, toupper((<SPAN CLASS="keyword">unsigned</SPAN> <SPAN CLASS="keyword">char</SPAN>) c));
+ <SPAN CLASS="keyword">return</SPAN> io::put(snk, toupper((<SPAN CLASS="keyword">unsigned</SPAN> <SPAN CLASS="keyword">char</SPAN>) c));
}
};</PRE>
Modified: branches/release/libs/iostreams/doc/installation.html
==============================================================================
--- branches/release/libs/iostreams/doc/installation.html (original)
+++ branches/release/libs/iostreams/doc/installation.html 2008-03-03 02:02:13 EST (Mon, 03 Mar 2008)
@@ -76,7 +76,7 @@
<H2>Building with Boost.Build</H2>
<P>
- To build with Boost.Build, run <I>bjam</I> from the directory <CODE>libs/iostreams/build</CODE>, or from the Boost root directory. If you want to use the compression filters, you may need to set several Boost.Build variables indicating where the source files or pre-built binaries are located. These variables are summarized in the following table.
+ To build with Boost.Build, run <I>bjam</I> from the directory <CODE>libs/iostreams/build</CODE>, or from the Boost root directory. If you want to use the compression filters, you may need to set several Boost.Build variables indicating where the source files or pre-built binaries are located. These variables are summarized in the following table.
</P>
<P>
On most UNIX systems, it should not be necessary to set any of these variables, since the zlib and libbz2 headers and binaries are already installed in locations where they will be found automatically. On Windows, the zlib and bzip2 filters are disabled by default; to enable support for these filters, you will need to set variables indicating the location of the source files, if building from the source, or the location of the headers and binaries, if using pre-built binaries.
Modified: branches/release/libs/iostreams/doc/portability.html
==============================================================================
--- branches/release/libs/iostreams/doc/portability.html (original)
+++ branches/release/libs/iostreams/doc/portability.html 2008-03-03 02:02:13 EST (Mon, 03 Mar 2008)
@@ -15,7 +15,7 @@
<!-- End Banner -->
<P>
- The Iostreams library has been tested with a wide variety of platforms. Please see the Boost regression reports for details.
+ The Iostreams library has been tested with a wide variety of platforms. Please see the Boost regression reports for details.
</P>
<!-- Begin Footer -->
Modified: branches/release/libs/iostreams/doc/tutorial/container_sink.html
==============================================================================
--- branches/release/libs/iostreams/doc/tutorial/container_sink.html (original)
+++ branches/release/libs/iostreams/doc/tutorial/container_sink.html 2008-03-03 02:02:13 EST (Mon, 03 Mar 2008)
@@ -66,7 +66,7 @@
<P>Here sink
is a convenience base class which provides the member types <CODE>char_type</CODE> and <CODE>category</CODE>, as well as no-op implementations of member functions <CODE>close</CODE> and <CODE>imbue</CODE>, not needed here.
-<P>You're now ready to write your <CODE>container_source</CODE>.</P>
+<P>You're now ready to write your <CODE>container_sink</CODE>.</P>
<PRE CLASS="broken_ie"><SPAN CLASS='preprocessor'>#include</SPAN> <SPAN CLASS='literal'><algorithm></SPAN> <SPAN CLASS='comment'>// copy, min</SPAN>
<SPAN CLASS='preprocessor'>#include</SPAN> <SPAN CLASS='literal'><iosfwd></SPAN> <SPAN CLASS='comment'>// streamsize</SPAN>
@@ -96,7 +96,7 @@
<UL>
<LI>The member type <CODE>char_type</CODE> is defined to be equal to the containers's <CODE>value_type</CODE>;
<LI>The member type <CODE>category</CODE> tells the Iostreams library that <CODE>container_sink</CODE> is a model of Sink;
-<LI>A <CODE>container_source</CODE> can be constructed from a instance of <CODE>Container</CODE>, which is passed and stored by reference, and accessible <I>via</I> the member function <CODE>container()</CODE>; and
+<LI>A <CODE>container_sink</CODE> can be constructed from a instance of <CODE>Container</CODE>, which is passed and stored by reference, and accessible <I>via</I> the member function <CODE>container()</CODE>; and
<LI>The implementation of <CODE>write()</CODE> simply appends the characters in the specified buffer to the underlying container using the container's <CODE>insert</CODE> funcion,
</UL>
@@ -105,7 +105,7 @@
<PRE CLASS="broken_ie"><SPAN CLASS='preprocessor'>#include</SPAN> <SPAN CLASS='literal'><cassert></SPAN>
<SPAN CLASS='preprocessor'>#include</SPAN> <SPAN CLASS='literal'><string></SPAN>
<SPAN CLASS='preprocessor'>#include</SPAN> <A CLASS="HEADER" HREF="../../../../boost/iostreams/stream.hpp"><SPAN CLASS='literal'><boost/iostreams/stream.hpp></SPAN></A>
-<SPAN CLASS='preprocessor'>#include</SPAN> <A CLASS="HEADER" HREF="../../example/container_device.hpp"><SPAN CLASS='literal'><libs/iostreams/example/container_device.hpp></SPAN></A> <SPAN CLASS='comment'>// container_source</SPAN>
+<SPAN CLASS='preprocessor'>#include</SPAN> <A CLASS="HEADER" HREF="../../example/container_device.hpp"><SPAN CLASS='literal'><libs/iostreams/example/container_device.hpp></SPAN></A> <SPAN CLASS='comment'>// container_sink</SPAN>
<SPAN CLASS='keyword'>namespace</SPAN> io = boost::iostreams;
<SPAN CLASS='keyword'>namespace</SPAN> ex = boost::iostreams::example;
Modified: branches/release/libs/iostreams/doc/tutorial/writing_devices.html
==============================================================================
--- branches/release/libs/iostreams/doc/tutorial/writing_devices.html (original)
+++ branches/release/libs/iostreams/doc/tutorial/writing_devices.html 2008-03-03 02:02:13 EST (Mon, 03 Mar 2008)
@@ -51,8 +51,8 @@
<SPAN CLASS='keyword'>int</SPAN> main()
{
- io::stream_buffer<file_sink> buf(<SPAN CLASS='literal'>"log.txt"</SPAN>);
- std::ostream out(&buf);
+ io::stream_buffer<io::file_sink> buf(<SPAN CLASS='literal'>"log.txt"</SPAN>);
+ std::ostream out(&buf);
<SPAN CLASS='comment'>// out writes to log.txt</SPAN>
}</PRE>
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