Merge [51862], [53211], [53212], and [53218] from the trunk

[SVN r53872]
This commit is contained in:
Steven Watanabe
2009-06-13 18:30:31 +00:00
parent 700d64acc8
commit 41ebb2ee6c
8 changed files with 191 additions and 129 deletions

View File

@ -27,15 +27,14 @@
#include <sstream>
#endif
using namespace std;
using namespace boost;
#if defined BOOST_NO_STRINGSTREAM
typedef ostrstream useThisOStringStream;
typedef istrstream useThisIStringStream;
typedef std::ostrstream useThisOStringStream;
typedef std::istrstream useThisIStringStream;
#else
typedef ostringstream useThisOStringStream;
typedef istringstream useThisIStringStream;
typedef std::ostringstream useThisOStringStream;
typedef std::istringstream useThisIStringStream;
#endif
int test_main(int argc, char * argv[] ) {
@ -70,19 +69,28 @@ int test_main(int argc, char * argv[] ) {
os1 << make_tuple(1, 2, 3);
BOOST_CHECK (os1.str() == std::string("[1,2,3][1,2,3]") );
ofstream tmp("temp.tmp");
// check empty tuple.
useThisOStringStream os3;
os3 << make_tuple();
BOOST_CHECK (os3.str() == std::string("()") );
os3 << set_open('[');
os3 << set_close(']');
os3 << make_tuple();
BOOST_CHECK (os3.str() == std::string("()[]") );
std::ofstream tmp("temp.tmp");
#if !defined (BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION)
tmp << make_tuple("One", "Two", 3);
#endif
tmp << set_delimiter(':');
tmp << make_tuple(1000, 2000, 3000) << endl;
tmp << make_tuple(1000, 2000, 3000) << std::endl;
tmp.close();
// When teading tuples from a stream, manipulators must be set correctly:
ifstream tmp3("temp.tmp");
tuple<string, string, int> j;
std::ifstream tmp3("temp.tmp");
tuple<std::string, std::string, int> j;
#if !defined (BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION)
tmp3 >> j;
@ -98,12 +106,19 @@ int test_main(int argc, char * argv[] ) {
// reading tuple<int, int, int> in format (a b c);
useThisIStringStream is("(100 200 300)");
tuple<int, int, int> ti;
BOOST_CHECK(bool(is >> ti));
BOOST_CHECK(ti == make_tuple(100, 200, 300));
useThisIStringStream is1("(100 200 300)");
tuple<int, int, int> ti1;
BOOST_CHECK(bool(is1 >> ti1));
BOOST_CHECK(ti1 == make_tuple(100, 200, 300));
useThisIStringStream is2("()");
tuple<> ti2;
BOOST_CHECK(bool(is2 >> ti2));
useThisIStringStream is3("[]");
is3 >> set_open('[');
is3 >> set_close(']');
BOOST_CHECK(bool(is3 >> ti2));
// Note that strings are problematic:
// writing a tuple on a stream and reading it back doesn't work in