Subject: [Boost-commit] svn:boost r68159 - in branches/release: boost/io boost/io/detail libs/io libs/io/doc libs/io/test
From: bdawes_at_[hidden]
Date: 2011-01-14 14:21:58
Author: bemandawes
Date: 2011-01-14 14:21:55 EST (Fri, 14 Jan 2011)
New Revision: 68159
URL: http://svn.boost.org/trac/boost/changeset/68159
Log:
Merge from trunk
Added:
branches/release/libs/io/doc/quoted_manip.html
- copied unchanged from r68158, /trunk/libs/io/doc/quoted_manip.html
branches/release/libs/io/test/quoted_manip_test.cpp
- copied unchanged from r68158, /trunk/libs/io/test/quoted_manip_test.cpp
Properties modified:
branches/release/boost/io/ (props changed)
branches/release/libs/io/ (props changed)
branches/release/libs/io/doc/ (props changed)
Text files modified:
branches/release/boost/io/detail/quoted_manip.hpp | 4 ++--
branches/release/libs/io/test/Jamfile.v2 | 2 ++
branches/release/libs/io/test/ios_state_test.cpp | 8 ++++----
branches/release/libs/io/test/ios_state_unit_test.cpp | 20 ++++++++++----------
4 files changed, 18 insertions(+), 16 deletions(-)
Modified: branches/release/boost/io/detail/quoted_manip.hpp
==============================================================================
--- branches/release/boost/io/detail/quoted_manip.hpp (original)
+++ branches/release/boost/io/detail/quoted_manip.hpp 2011-01-14 14:21:55 EST (Fri, 14 Jan 2011)
@@ -125,15 +125,15 @@
std::basic_istream<Char, Traits>& operator>>(std::basic_istream<Char, Traits>& is,
const quoted_proxy<std::basic_string<Char, Traits, Alloc>&, Char>& proxy)
{
+ proxy.string.clear();
Char c;
is >> c;
if (c != proxy.delim)
{
- proxy.string = c;
+ is.unget();
is >> proxy.string;
return is;
}
- proxy.string.clear();
{
boost::io::ios_flags_saver ifs(is);
is >> std::noskipws;
Modified: branches/release/libs/io/test/Jamfile.v2
==============================================================================
--- branches/release/libs/io/test/Jamfile.v2 (original)
+++ branches/release/libs/io/test/Jamfile.v2 2011-01-14 14:21:55 EST (Fri, 14 Jan 2011)
@@ -21,4 +21,6 @@
: # input files
# : std::locale-support
]
+
+ [ run quoted_manip_test.cpp ]
;
Modified: branches/release/libs/io/test/ios_state_test.cpp
==============================================================================
--- branches/release/libs/io/test/ios_state_test.cpp (original)
+++ branches/release/libs/io/test/ios_state_test.cpp 2011-01-14 14:21:55 EST (Fri, 14 Jan 2011)
@@ -16,7 +16,7 @@
#include <boost/io/ios_state.hpp> // for boost::io::ios_flags_saver, etc.
#include <cstddef> // for std::size_t
-#include <iomanip> // for std::setw
+#include <boost/detail/iomanip.hpp> // for boost::detail::setw
#include <ios> // for std::ios_base, std::streamsize, etc.
#include <iostream> // for std::cout, etc.
#include <istream> // for std::istream
@@ -143,7 +143,7 @@
{
using std::locale;
using std::ios_base;
- using std::setw;
+ using boost::detail::setw;
boost::io::ios_flags_saver const ifls( output );
boost::io::ios_precision_saver const iprs( output );
@@ -168,8 +168,8 @@
output.fill( '@' );
output.precision( 9 );
output << '\t' << test_string << '\n';
- output << '\t' << setw( 10 ) << test_num1 << '\n';
- output << '\t' << setw( 15 ) << test_num2 << '\n';
+ output << '\t' << boost::detail::setw( 10 ) << test_num1 << '\n';
+ output << '\t' << boost::detail::setw( 15 ) << test_num2 << '\n';
output.imbue( loc );
output << '\t' << test_bool << '\n';
Modified: branches/release/libs/io/test/ios_state_unit_test.cpp
==============================================================================
--- branches/release/libs/io/test/ios_state_unit_test.cpp (original)
+++ branches/release/libs/io/test/ios_state_unit_test.cpp 2011-01-14 14:21:55 EST (Fri, 14 Jan 2011)
@@ -13,7 +13,7 @@
#include <boost/test/unit_test.hpp> // for main, BOOST_CHECK, etc.
#include <cstddef> // for NULL
-#include <iomanip> // for std::setiosflags, etc.
+#include <boost/detail/iomanip.hpp> // for boost::detail::setiosflags, etc.
#include <ios> // for std::ios_base
#include <iostream> // for std::cout, std::cerr, etc.
#include <istream> // for std::iostream
@@ -77,7 +77,7 @@
BOOST_CHECK_EQUAL( (ios_base::showbase | ios_base::internal),
ss.flags() );
- ss << setiosflags( ios_base::unitbuf );
+ ss << boost::detail::setiosflags( ios_base::unitbuf );
BOOST_CHECK_EQUAL( (ios_base::showbase | ios_base::internal
| ios_base::unitbuf), ss.flags() );
}
@@ -102,7 +102,7 @@
BOOST_CHECK_EQUAL( 6, ss.precision() );
- ss << setprecision( 4 );
+ ss << boost::detail::setprecision( 4 );
BOOST_CHECK_EQUAL( 4, ss.precision() );
}
@@ -113,7 +113,7 @@
BOOST_CHECK_EQUAL( 8, ss.precision() );
- ss << setprecision( 10 );
+ ss << boost::detail::setprecision( 10 );
BOOST_CHECK_EQUAL( 10, ss.precision() );
}
@@ -137,7 +137,7 @@
BOOST_CHECK_EQUAL( 0, ss.width() );
- ss << setw( 4 );
+ ss << boost::detail::setw( 4 );
BOOST_CHECK_EQUAL( 4, ss.width() );
}
@@ -148,7 +148,7 @@
BOOST_CHECK_EQUAL( 8, ss.width() );
- ss << setw( 10 );
+ ss << boost::detail::setw( 10 );
BOOST_CHECK_EQUAL( 10, ss.width() );
}
@@ -507,7 +507,7 @@
BOOST_CHECK_EQUAL( 6, ss.precision() );
BOOST_CHECK_EQUAL( 0, ss.width() );
- ss << hex << unitbuf << setprecision( 5 ) << setw( 7 );
+ ss << hex << unitbuf << boost::detail::setprecision( 5 ) << boost::detail::setw( 7 );
BOOST_CHECK_EQUAL( (ios_base::unitbuf | ios_base::hex
| ios_base::skipws), ss.flags() );
BOOST_CHECK_EQUAL( 5, ss.precision() );
@@ -560,10 +560,10 @@
ss << oct << showpos << noskipws;
BOOST_CHECK_EQUAL( (ios_base::showpos | ios_base::oct), ss.flags() );
- ss << setprecision( 3 );
+ ss << boost::detail::setprecision( 3 );
BOOST_CHECK_EQUAL( 3, ss.precision() );
- ss << setw( 9 );
+ ss << boost::detail::setw( 9 );
BOOST_CHECK_EQUAL( 9, ss.width() );
ss.setstate( ios_base::eofbit );
@@ -586,7 +586,7 @@
ss.rdbuf( cerr.rdbuf() );
BOOST_CHECK_EQUAL( cerr.rdbuf(), ss.rdbuf() );
- ss << setfill( 'x' );
+ ss << boost::detail::setfill( 'x' );
BOOST_CHECK_EQUAL( 'x', ss.fill() );
ss.imbue( locale(locale::classic(), new backward_bool_names) );