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)
//
@@ -37,7 +37,7 @@ using namespace boost::interprocess;
static int vectorstream_test()
{
{ //Test high watermarking initialization
{ //Test high watermarking initialization
my_stringstream_t my_stringstream;
int a (0);
my_stringstream << 11;
@@ -45,7 +45,7 @@ static int vectorstream_test()
if(a != 11)
return 1;
}
{ //Test high watermarking initialization
{ //Test high watermarking initialization
my_vectorstream_t my_stringstream;
int a (0);
my_stringstream << 13;
@@ -66,7 +66,7 @@ static int vectorstream_test()
my_stringstream << "testline: " << i << std::endl;
std_stringstream << "testline: " << i << std::endl;
}
if(std::strcmp(my_stringstream.vector().c_str(), std_stringstream.str().c_str()) != 0){
return 1;
}
@@ -75,10 +75,10 @@ static int vectorstream_test()
my_stringstream >> 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;
}
}
}
@@ -105,10 +105,10 @@ static int vectorstream_test()
my_vectorstream >> 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;
}
}
}
@@ -131,10 +131,10 @@ static int vectorstream_test()
my_stringstream >> 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;
}
}
}