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

@ -21,7 +21,6 @@
#include <string>
#include <utility>
using namespace std;
using namespace boost;
// ----------------------------------------------------------------------------
@ -274,7 +273,7 @@ make_tuple_test()
BOOST_CHECK(get<1>(t1) == 'a');
tuple<int, std::string> t2;
t2 = make_tuple((short int)2, std::string("Hi"));
t2 = boost::make_tuple((short int)2, std::string("Hi"));
BOOST_CHECK(get<0>(t2) == 2);
BOOST_CHECK(get<1>(t2) == "Hi");