Merged from trunk

[SVN r79561]
This commit is contained in:
Ion Gaztañaga
2012-07-16 09:08:27 +00:00
parent 8cd85f9cd3
commit bf0d7d7727
2 changed files with 39 additions and 18 deletions
+31 -18
View File
@@ -17,29 +17,42 @@
template<class Container>
int move_test()
{
//Default construct 10 movable objects
Container v(10);
bool use_move_iterator = false;
bool done = false;
while(!done){
//Default construct 10 movable objects
Container v(10);
//Test default constructed value
if(v.begin()->moved()){
return 1;
}
//Test default constructed value
if(v.begin()->moved()){
return 1;
}
//Move values
Container v2;
std::copy(v.begin(), v.end(), boost::back_move_inserter(v2));
//Move values
Container v2;
if(use_move_iterator){
::boost::copy_or_move( boost::make_move_iterator(v.begin())
, boost::make_move_iterator(v.end())
, boost::back_move_inserter(v2));
}
else{
std::copy(v.begin(), v.end(), boost::back_move_inserter(v2));
}
//Test values have been moved
if(!v.begin()->moved()){
return 1;
}
//Test values have been moved
if(!v.begin()->moved()){
return 1;
}
if(v2.size() != 10){
return 1;
}
if(v2.size() != 10){
return 1;
}
if(v2.begin()->moved()){
return 1;
if(v2.begin()->moved()){
return 1;
}
done = use_move_iterator;
use_move_iterator = true;
}
return 0;
}