Merge from trunk

[SVN r80689]
This commit is contained in:
Ion Gaztañaga
2012-09-24 12:17:34 +00:00
parent 10f3fdf152
commit ac41d855bb
317 changed files with 5176 additions and 1963 deletions

View File

@@ -1,6 +1,6 @@
//////////////////////////////////////////////////////////////////////////////
//
// (C) Copyright Ion Gaztanaga 2006. Distributed under the Boost
// (C) Copyright Ion Gaztanaga 2006-2012. Distributed under the Boost
// Software License, Version 1.0. (See accompanying file
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
//
@@ -60,10 +60,10 @@ static int bufferstream_test()
bufstream >> str1 >> number1;
std_stringstream >> str2 >> number2;
if((str1 != str2) || (str1 != str3)){
assert(0); return 1;
assert(0); return 1;
}
if((number1 != number2) || (number1 != i)){
assert(0); return 1;
assert(0); return 1;
}
}
//We shouldn't have reached the end of the buffer reading
@@ -90,7 +90,7 @@ static int bufferstream_test()
bufstream << "testline: " << i << std::endl;
std_stringstream << "testline: " << i << std::endl;
}
//Contents should be different
if(std::strcmp(buffer, std_stringstream.str().c_str()) == 0){
return 1;