Index: another_tuple_test_bench.cpp =================================================================== --- another_tuple_test_bench.cpp (revision 52977) +++ another_tuple_test_bench.cpp (working copy) @@ -23,7 +23,6 @@ #include #include -using namespace std; using namespace boost; using namespace boost::tuples; Index: io_test.cpp =================================================================== --- io_test.cpp (revision 52977) +++ io_test.cpp (working copy) @@ -27,15 +27,14 @@ #include #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,19 @@ os1 << make_tuple(1, 2, 3); BOOST_CHECK (os1.str() == std::string("[1,2,3][1,2,3]") ); - ofstream tmp("temp.tmp"); + 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 j; + std::ifstream tmp3("temp.tmp"); + tuple j; #if !defined (BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) tmp3 >> j; Index: tuple_test_bench.cpp =================================================================== --- tuple_test_bench.cpp (revision 52977) +++ tuple_test_bench.cpp (working copy) @@ -21,7 +21,6 @@ #include #include -using namespace std; using namespace boost; // ---------------------------------------------------------------------------- @@ -274,7 +273,7 @@ BOOST_CHECK(get<1>(t1) == 'a'); tuple 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");