2007-07-12 Douglas Gregor <doug.gregor@gmail.com>

	* testsuite/tr1/3_function_objects/bind/all_bound.cc: Disambiguate uses of
	TR1/C++0x facilities.
	* testsuite/tr1/3_function_objects/bind/nested.cc: Ditto.
	* testsuite/tr1/3_function_objects/bind/placeholders.cc: Ditto.
	* testsuite/tr1/6_containers/unordered_multimap/requirements/explicit_instantiation.cc: 
	Ditto. 
	* testsuite/tr1/6_containers/unordered_multimap/swap/1.cc: Ditto.
	* testsuite/tr1/6_containers/unordered_multimap/swap/2.cc: Ditto.
	* testsuite/tr1/6_containers/unordered_set/requirements/explicit_instantiation.cc: 
	Ditto.
	* testsuite/tr1/6_containers/unordered_set/swap/1.cc: Ditto.
	* testsuite/tr1/6_containers/unordered_set/swap/2.cc: Ditto.
	* testsuite/tr1/6_containers/utility/pair.cc: Ditto.
	* testsuite/tr1/6_containers/unordered_map/requirements/explicit_instantiation.cc: 
	Ditto. 
	* testsuite/tr1/6_containers/unordered_map/24064.cc: Ditto.
	* testsuite/tr1/6_containers/unordered_map/swap/1.cc: Ditto.
	* testsuite/tr1/6_containers/unordered_map/swap/2.cc: Ditto.
	* testsuite/tr1/6_containers/tuple/cons/big_tuples.cc: Ditto.
	* testsuite/tr1/6_containers/tuple/cons/constructor.cc: Ditto.
	* testsuite/tr1/6_containers/tuple/cons/assignment.cc: Ditto.
	* testsuite/tr1/6_containers/tuple/tuple_element.cc: Ditto.
	* testsuite/tr1/6_containers/tuple/tuple_size.cc: Ditto.
	* testsuite/tr1/6_containers/tuple/comparison_operators/comparisons.cc:
	Ditto. 
	* testsuite/tr1/6_containers/tuple/element_access/get.cc: Ditto.
	* testsuite/tr1/6_containers/tuple/creation_functions/23978.cc: Ditto.
	* testsuite/tr1/6_containers/tuple/creation_functions/tie.cc: Ditto.
	* testsuite/tr1/6_containers/tuple/creation_functions/make_tuple.cc: Ditto.
	* testsuite/tr1/6_containers/unordered_multiset/requirements/explicit_instantiation.cc: 
	Ditto.
	* testsuite/tr1/6_containers/unordered_multiset/swap/1.cc: Ditto.
	* testsuite/tr1/6_containers/unordered_multiset/swap/2.cc: Ditto.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@126590 138bc75d-0d04-0410-961f-82ee72b054a4

28 files changed, 105 insertions, 56 deletions

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 3da113050e0..8daf74a04a8 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,39 @@
+2007-07-12  Douglas Gregor  <doug.gregor@gmail.com>
+
+	* testsuite/tr1/3_function_objects/bind/all_bound.cc: Disambiguate uses of
+	TR1/C++0x facilities.
+	* testsuite/tr1/3_function_objects/bind/nested.cc: Ditto.
+	* testsuite/tr1/3_function_objects/bind/placeholders.cc: Ditto.
+	* testsuite/tr1/6_containers/unordered_multimap/requirements/explicit_instantiation.cc: 
+	Ditto. 
+	* testsuite/tr1/6_containers/unordered_multimap/swap/1.cc: Ditto.
+	* testsuite/tr1/6_containers/unordered_multimap/swap/2.cc: Ditto.
+	* testsuite/tr1/6_containers/unordered_set/requirements/explicit_instantiation.cc: 
+	Ditto.
+	* testsuite/tr1/6_containers/unordered_set/swap/1.cc: Ditto.
+	* testsuite/tr1/6_containers/unordered_set/swap/2.cc: Ditto.
+	* testsuite/tr1/6_containers/utility/pair.cc: Ditto.
+	* testsuite/tr1/6_containers/unordered_map/requirements/explicit_instantiation.cc: 
+	Ditto. 
+	* testsuite/tr1/6_containers/unordered_map/24064.cc: Ditto.
+	* testsuite/tr1/6_containers/unordered_map/swap/1.cc: Ditto.
+	* testsuite/tr1/6_containers/unordered_map/swap/2.cc: Ditto.
+	* testsuite/tr1/6_containers/tuple/cons/big_tuples.cc: Ditto.
+	* testsuite/tr1/6_containers/tuple/cons/constructor.cc: Ditto.
+	* testsuite/tr1/6_containers/tuple/cons/assignment.cc: Ditto.
+	* testsuite/tr1/6_containers/tuple/tuple_element.cc: Ditto.
+	* testsuite/tr1/6_containers/tuple/tuple_size.cc: Ditto.
+	* testsuite/tr1/6_containers/tuple/comparison_operators/comparisons.cc:
+	Ditto. 
+	* testsuite/tr1/6_containers/tuple/element_access/get.cc: Ditto.
+	* testsuite/tr1/6_containers/tuple/creation_functions/23978.cc: Ditto.
+	* testsuite/tr1/6_containers/tuple/creation_functions/tie.cc: Ditto.
+	* testsuite/tr1/6_containers/tuple/creation_functions/make_tuple.cc: Ditto.
+	* testsuite/tr1/6_containers/unordered_multiset/requirements/explicit_instantiation.cc: 
+	Ditto.
+	* testsuite/tr1/6_containers/unordered_multiset/swap/1.cc: Ditto.
+	* testsuite/tr1/6_containers/unordered_multiset/swap/2.cc: Ditto.
+
 2007-07-10  Bob Wilson  <bob.wilson@acm.org>
 	
 	* configure.ac: Check if $atomicity_dir is cpu/generic/atomicity_mutex
diff --git a/libstdc++-v3/testsuite/tr1/3_function_objects/bind/all_bound.cc b/libstdc++-v3/testsuite/tr1/3_function_objects/bind/all_bound.cc
index 9d973cf8006..20c6d7a2397 100644
--- a/libstdc++-v3/testsuite/tr1/3_function_objects/bind/all_bound.cc
+++ b/libstdc++-v3/testsuite/tr1/3_function_objects/bind/all_bound.cc
@@ -30,12 +30,10 @@ bool test __attribute__((unused)) = true;
 // Operations on empty function<> objects
 void test01()
 {
-  using std::tr1::bind;
-
-  VERIFY( bind(std::plus<int>(), 3, 5)() == 8 );
-  VERIFY( bind(std::minus<int>(), 3, 5)() == -2 );
-  VERIFY( bind<int>(std::plus<int>(), 3, 5)() == 8 );
-  VERIFY( bind<int>(std::minus<int>(), 3, 5)() == -2 );
+  VERIFY( std::tr1::bind(std::plus<int>(), 3, 5)() == 8 );
+  VERIFY( std::tr1::bind(std::minus<int>(), 3, 5)() == -2 );
+  VERIFY( std::tr1::bind<int>(std::plus<int>(), 3, 5)() == 8 );
+  VERIFY( std::tr1::bind<int>(std::minus<int>(), 3, 5)() == -2 );
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/tr1/3_function_objects/bind/nested.cc b/libstdc++-v3/testsuite/tr1/3_function_objects/bind/nested.cc
index 15b890ccf4b..a5db8b34368 100644
--- a/libstdc++-v3/testsuite/tr1/3_function_objects/bind/nested.cc
+++ b/libstdc++-v3/testsuite/tr1/3_function_objects/bind/nested.cc
@@ -30,13 +30,12 @@ bool test __attribute__((unused)) = true;
 // Operations on empty function<> objects
 void test01()
 {
-  using std::tr1::bind;
   using namespace std::tr1::placeholders;
 
   int five = 5;
   int seven = 7;
-  VERIFY( bind(std::multiplies<int>(), _1, bind(std::minus<int>(), 6, _2))(five, seven) == -5 );
-  VERIFY( bind(std::multiplies<int>(), _1, bind(std::minus<int>(), 6, _2))(seven, five) == 7 );
+  VERIFY( std::tr1::bind(std::multiplies<int>(), _1, std::tr1::bind(std::minus<int>(), 6, _2))(five, seven) == -5 );
+  VERIFY( std::tr1::bind(std::multiplies<int>(), _1, std::tr1::bind(std::minus<int>(), 6, _2))(seven, five) == 7 );
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/tr1/3_function_objects/bind/placeholders.cc b/libstdc++-v3/testsuite/tr1/3_function_objects/bind/placeholders.cc
index 53e021a9c98..1d07a798296 100644
--- a/libstdc++-v3/testsuite/tr1/3_function_objects/bind/placeholders.cc
+++ b/libstdc++-v3/testsuite/tr1/3_function_objects/bind/placeholders.cc
@@ -30,13 +30,12 @@ bool test __attribute__((unused)) = true;
 // Operations on empty function<> objects
 void test01()
 {
-  using std::tr1::bind;
   using namespace std::tr1::placeholders;
 
   int five = 5;
   int seven = 7;
-  VERIFY( bind(std::minus<int>(), _1, _2)(five, seven) == -2 );
-  VERIFY( bind(std::minus<int>(), _2, _1)(five, seven) == 2 );
+  VERIFY( std::tr1::bind(std::minus<int>(), _1, _2)(five, seven) == -2 );
+  VERIFY( std::tr1::bind(std::minus<int>(), _2, _1)(five, seven) == 2 );
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/tr1/6_containers/tuple/comparison_operators/comparisons.cc b/libstdc++-v3/testsuite/tr1/6_containers/tuple/comparison_operators/comparisons.cc
index 2b8e231f6ff..f22d975c86b 100644
--- a/libstdc++-v3/testsuite/tr1/6_containers/tuple/comparison_operators/comparisons.cc
+++ b/libstdc++-v3/testsuite/tr1/6_containers/tuple/comparison_operators/comparisons.cc
@@ -23,8 +23,7 @@
 #include <tr1/tuple>
 #include <testsuite_hooks.h>
 
-using namespace std;
-using namespace tr1;
+using namespace std::tr1;
 
 #define TEST1(x) VERIFY( x == x && !(x != x) && x <= x && !(x < x) )
 
diff --git a/libstdc++-v3/testsuite/tr1/6_containers/tuple/cons/assignment.cc b/libstdc++-v3/testsuite/tr1/6_containers/tuple/cons/assignment.cc
index c145191678b..6207b41f9df 100644
--- a/libstdc++-v3/testsuite/tr1/6_containers/tuple/cons/assignment.cc
+++ b/libstdc++-v3/testsuite/tr1/6_containers/tuple/cons/assignment.cc
@@ -23,8 +23,7 @@
 #include <tr1/tuple>
 #include <testsuite_hooks.h>
 
-using namespace std;
-using namespace tr1;
+using namespace std::tr1;
 
 int
 main()
diff --git a/libstdc++-v3/testsuite/tr1/6_containers/tuple/cons/big_tuples.cc b/libstdc++-v3/testsuite/tr1/6_containers/tuple/cons/big_tuples.cc
index de2784a9c39..a23ad8dbc74 100644
--- a/libstdc++-v3/testsuite/tr1/6_containers/tuple/cons/big_tuples.cc
+++ b/libstdc++-v3/testsuite/tr1/6_containers/tuple/cons/big_tuples.cc
@@ -23,8 +23,8 @@
 #include <tr1/tuple>
 #include <testsuite_hooks.h>
 
-using namespace std;
-using namespace tr1;
+using namespace std::tr1;
+using std::pair;
 
 // A simple class without conversions to check some things
 struct foo
diff --git a/libstdc++-v3/testsuite/tr1/6_containers/tuple/cons/constructor.cc b/libstdc++-v3/testsuite/tr1/6_containers/tuple/cons/constructor.cc
index a869ac37310..89e9a113ffa 100644
--- a/libstdc++-v3/testsuite/tr1/6_containers/tuple/cons/constructor.cc
+++ b/libstdc++-v3/testsuite/tr1/6_containers/tuple/cons/constructor.cc
@@ -23,8 +23,8 @@
 #include <tr1/tuple>
 #include <testsuite_hooks.h>
 
-using namespace std;
-using namespace tr1;
+using namespace std::tr1;
+using std::pair;
 
 int
 main()
diff --git a/libstdc++-v3/testsuite/tr1/6_containers/tuple/creation_functions/23978.cc b/libstdc++-v3/testsuite/tr1/6_containers/tuple/creation_functions/23978.cc
index 2c94f3314dd..70a2cf8c6bd 100644
--- a/libstdc++-v3/testsuite/tr1/6_containers/tuple/creation_functions/23978.cc
+++ b/libstdc++-v3/testsuite/tr1/6_containers/tuple/creation_functions/23978.cc
@@ -24,8 +24,8 @@
 #include <tr1/utility>
 #include <testsuite_hooks.h>
 
-using namespace std;
-using namespace tr1;
+using namespace std::tr1;
+using std::pair;
 
 // libstdc++/23978
 void test01()
diff --git a/libstdc++-v3/testsuite/tr1/6_containers/tuple/creation_functions/make_tuple.cc b/libstdc++-v3/testsuite/tr1/6_containers/tuple/creation_functions/make_tuple.cc
index a599b7ec7b6..ca69be21f0e 100644
--- a/libstdc++-v3/testsuite/tr1/6_containers/tuple/creation_functions/make_tuple.cc
+++ b/libstdc++-v3/testsuite/tr1/6_containers/tuple/creation_functions/make_tuple.cc
@@ -24,8 +24,7 @@
 #include <tr1/functional>
 #include <testsuite_hooks.h>
 
-using namespace std;
-using namespace tr1;
+using namespace std::tr1;
 
 int
 main()
diff --git a/libstdc++-v3/testsuite/tr1/6_containers/tuple/creation_functions/tie.cc b/libstdc++-v3/testsuite/tr1/6_containers/tuple/creation_functions/tie.cc
index c3c40e5de67..ea63a5d5c6a 100644
--- a/libstdc++-v3/testsuite/tr1/6_containers/tuple/creation_functions/tie.cc
+++ b/libstdc++-v3/testsuite/tr1/6_containers/tuple/creation_functions/tie.cc
@@ -23,8 +23,7 @@
 #include <tr1/tuple>
 #include <testsuite_hooks.h>
 
-using namespace std;
-using namespace tr1;
+using namespace std::tr1;
 
 int
 main()
diff --git a/libstdc++-v3/testsuite/tr1/6_containers/tuple/element_access/get.cc b/libstdc++-v3/testsuite/tr1/6_containers/tuple/element_access/get.cc
index 7970d1fab5e..85ec6cb10dc 100644
--- a/libstdc++-v3/testsuite/tr1/6_containers/tuple/element_access/get.cc
+++ b/libstdc++-v3/testsuite/tr1/6_containers/tuple/element_access/get.cc
@@ -23,8 +23,7 @@
 #include <tr1/tuple>
 #include <testsuite_hooks.h>
 
-using namespace std;
-using namespace tr1;
+using namespace std::tr1;
 
 int
 main()
diff --git a/libstdc++-v3/testsuite/tr1/6_containers/tuple/tuple_element.cc b/libstdc++-v3/testsuite/tr1/6_containers/tuple/tuple_element.cc
index 53bc46dd951..44a93171e85 100644
--- a/libstdc++-v3/testsuite/tr1/6_containers/tuple/tuple_element.cc
+++ b/libstdc++-v3/testsuite/tr1/6_containers/tuple/tuple_element.cc
@@ -23,8 +23,7 @@
 #include <tr1/tuple>
 #include <testsuite_hooks.h>
 
-using namespace std;
-using namespace tr1;
+using namespace std::tr1;
 
 struct foo
 { };
diff --git a/libstdc++-v3/testsuite/tr1/6_containers/tuple/tuple_size.cc b/libstdc++-v3/testsuite/tr1/6_containers/tuple/tuple_size.cc
index b868b356968..967cb43d95c 100644
--- a/libstdc++-v3/testsuite/tr1/6_containers/tuple/tuple_size.cc
+++ b/libstdc++-v3/testsuite/tr1/6_containers/tuple/tuple_size.cc
@@ -23,8 +23,7 @@
 #include <tr1/tuple>
 #include <testsuite_hooks.h>
 
-using namespace std;
-using namespace tr1;
+using namespace std::tr1;
 
 int
 main()
diff --git a/libstdc++-v3/testsuite/tr1/6_containers/unordered_map/24064.cc b/libstdc++-v3/testsuite/tr1/6_containers/unordered_map/24064.cc
index aaacb70a0f5..b9f9bd2849c 100644
--- a/libstdc++-v3/testsuite/tr1/6_containers/unordered_map/24064.cc
+++ b/libstdc++-v3/testsuite/tr1/6_containers/unordered_map/24064.cc
@@ -26,8 +26,10 @@ void test01()
 {
   bool test __attribute__((unused)) = true;
 
-  using namespace std;
-  using namespace tr1;
+  using namespace std::tr1;
+  using std::allocator;
+  using std::pair;
+  using std::equal_to;
 
   __unordered_map<int, char, hash<int>, equal_to<int>,
     allocator<pair<const int, char> >, true> m;
diff --git a/libstdc++-v3/testsuite/tr1/6_containers/unordered_map/requirements/explicit_instantiation.cc b/libstdc++-v3/testsuite/tr1/6_containers/unordered_map/requirements/explicit_instantiation.cc
index 8fb0b9f3b62..865ca37bd44 100644
--- a/libstdc++-v3/testsuite/tr1/6_containers/unordered_map/requirements/explicit_instantiation.cc
+++ b/libstdc++-v3/testsuite/tr1/6_containers/unordered_map/requirements/explicit_instantiation.cc
@@ -25,8 +25,11 @@
 #include <string>
 #include <tr1/unordered_map>
 
-using namespace std;
 using namespace std::tr1;
+using std::string;
+using std::allocator;
+using std::pair;
+using std::equal_to;
 
 template class unordered_map<string, float>;
 template class unordered_map<string, int,
diff --git a/libstdc++-v3/testsuite/tr1/6_containers/unordered_map/swap/1.cc b/libstdc++-v3/testsuite/tr1/6_containers/unordered_map/swap/1.cc
index d379774926d..3533aab61fa 100644
--- a/libstdc++-v3/testsuite/tr1/6_containers/unordered_map/swap/1.cc
+++ b/libstdc++-v3/testsuite/tr1/6_containers/unordered_map/swap/1.cc
@@ -30,8 +30,10 @@ void
 test01()
 {
   bool test __attribute__((unused)) = true;
-  using namespace std;
-  using namespace tr1;
+  using namespace std::tr1;
+  using std::pair;
+  using std::equal_to;
+  using std::map;
 
   typedef pair<const char, int> my_pair;
   typedef __gnu_test::uneq_allocator<my_pair> my_alloc;
diff --git a/libstdc++-v3/testsuite/tr1/6_containers/unordered_map/swap/2.cc b/libstdc++-v3/testsuite/tr1/6_containers/unordered_map/swap/2.cc
index 8d708292ae3..acd742e6e6a 100644
--- a/libstdc++-v3/testsuite/tr1/6_containers/unordered_map/swap/2.cc
+++ b/libstdc++-v3/testsuite/tr1/6_containers/unordered_map/swap/2.cc
@@ -30,8 +30,10 @@ void
 test01()
 {
   bool test __attribute__((unused)) = true;
-  using namespace std;
-  using namespace tr1;
+  using namespace std::tr1;
+  using std::pair;
+  using std::equal_to;
+  using std::map;
 
   typedef pair<const char, int> my_pair;
   typedef __gnu_test::uneq_allocator<my_pair> my_alloc;
diff --git a/libstdc++-v3/testsuite/tr1/6_containers/unordered_multimap/requirements/explicit_instantiation.cc b/libstdc++-v3/testsuite/tr1/6_containers/unordered_multimap/requirements/explicit_instantiation.cc
index 5433e0efa91..0bfec766c06 100644
--- a/libstdc++-v3/testsuite/tr1/6_containers/unordered_multimap/requirements/explicit_instantiation.cc
+++ b/libstdc++-v3/testsuite/tr1/6_containers/unordered_multimap/requirements/explicit_instantiation.cc
@@ -25,8 +25,11 @@
 #include <string>
 #include <tr1/unordered_map>
 
-using namespace std;
 using namespace std::tr1;
+using std::string;
+using std::equal_to;
+using std::allocator;
+using std::pair;
 
 template class unordered_multimap<string, float>;
 template class unordered_multimap<string, int,
diff --git a/libstdc++-v3/testsuite/tr1/6_containers/unordered_multimap/swap/1.cc b/libstdc++-v3/testsuite/tr1/6_containers/unordered_multimap/swap/1.cc
index 7648e08bd62..2fd0cab7da8 100644
--- a/libstdc++-v3/testsuite/tr1/6_containers/unordered_multimap/swap/1.cc
+++ b/libstdc++-v3/testsuite/tr1/6_containers/unordered_multimap/swap/1.cc
@@ -30,8 +30,11 @@ void
 test01()
 {
   bool test __attribute__((unused)) = true;
-  using namespace std;
-  using namespace tr1;
+  using namespace std::tr1;
+  using std::pair;
+  using std::equal_to;
+  using std::map;
+  using std::multimap;
 
   typedef pair<const char, int> my_pair;
   typedef __gnu_test::uneq_allocator<my_pair> my_alloc;
diff --git a/libstdc++-v3/testsuite/tr1/6_containers/unordered_multimap/swap/2.cc b/libstdc++-v3/testsuite/tr1/6_containers/unordered_multimap/swap/2.cc
index f7744ebe854..249cc560e95 100644
--- a/libstdc++-v3/testsuite/tr1/6_containers/unordered_multimap/swap/2.cc
+++ b/libstdc++-v3/testsuite/tr1/6_containers/unordered_multimap/swap/2.cc
@@ -30,8 +30,11 @@ void
 test01()
 {
   bool test __attribute__((unused)) = true;
-  using namespace std;
-  using namespace tr1;
+  using namespace std::tr1;
+  using std::pair;
+  using std::equal_to;
+  using std::map;
+  using std::multimap;
 
   typedef pair<const char, int> my_pair;
   typedef __gnu_test::uneq_allocator<my_pair> my_alloc;
diff --git a/libstdc++-v3/testsuite/tr1/6_containers/unordered_multiset/requirements/explicit_instantiation.cc b/libstdc++-v3/testsuite/tr1/6_containers/unordered_multiset/requirements/explicit_instantiation.cc
index 4389e1b805e..13d20fa7fbe 100644
--- a/libstdc++-v3/testsuite/tr1/6_containers/unordered_multiset/requirements/explicit_instantiation.cc
+++ b/libstdc++-v3/testsuite/tr1/6_containers/unordered_multiset/requirements/explicit_instantiation.cc
@@ -24,8 +24,9 @@
 
 #include <tr1/unordered_set>
 
-using namespace std;
 using namespace std::tr1;
+using std::equal_to;
+using std::allocator;
 
 template class unordered_multiset<int>;
 template class unordered_multiset<float, hash<float>, equal_to<float>,
diff --git a/libstdc++-v3/testsuite/tr1/6_containers/unordered_multiset/swap/1.cc b/libstdc++-v3/testsuite/tr1/6_containers/unordered_multiset/swap/1.cc
index ca0194e3375..a19ddd6a521 100644
--- a/libstdc++-v3/testsuite/tr1/6_containers/unordered_multiset/swap/1.cc
+++ b/libstdc++-v3/testsuite/tr1/6_containers/unordered_multiset/swap/1.cc
@@ -30,8 +30,9 @@ void
 test01()
 {
   bool test __attribute__((unused)) = true;
-  using namespace std;
-  using namespace tr1;
+  using namespace std::tr1;
+  using std::equal_to;
+  using std::multiset;
 
   typedef __gnu_test::uneq_allocator<char> my_alloc;
   typedef unordered_multiset<char, hash<char>, equal_to<char>, my_alloc>
diff --git a/libstdc++-v3/testsuite/tr1/6_containers/unordered_multiset/swap/2.cc b/libstdc++-v3/testsuite/tr1/6_containers/unordered_multiset/swap/2.cc
index a95ddd51fc8..5da6e28d037 100644
--- a/libstdc++-v3/testsuite/tr1/6_containers/unordered_multiset/swap/2.cc
+++ b/libstdc++-v3/testsuite/tr1/6_containers/unordered_multiset/swap/2.cc
@@ -30,8 +30,9 @@ void
 test01()
 {
   bool test __attribute__((unused)) = true;
-  using namespace std;
-  using namespace tr1;
+  using namespace std::tr1;
+  using std::equal_to;
+  using std::multiset;
 
   typedef __gnu_test::uneq_allocator<char> my_alloc;
   typedef unordered_multiset<char, hash<char>, equal_to<char>, my_alloc>
diff --git a/libstdc++-v3/testsuite/tr1/6_containers/unordered_set/requirements/explicit_instantiation.cc b/libstdc++-v3/testsuite/tr1/6_containers/unordered_set/requirements/explicit_instantiation.cc
index a006abfcbb4..503e27a373c 100644
--- a/libstdc++-v3/testsuite/tr1/6_containers/unordered_set/requirements/explicit_instantiation.cc
+++ b/libstdc++-v3/testsuite/tr1/6_containers/unordered_set/requirements/explicit_instantiation.cc
@@ -24,8 +24,9 @@
 
 #include <tr1/unordered_set>
 
-using namespace std;
 using namespace std::tr1;
+using std::equal_to;
+using std::allocator;
 
 template class unordered_set<int>;
 template class unordered_set<float, hash<float>, equal_to<float>,
diff --git a/libstdc++-v3/testsuite/tr1/6_containers/unordered_set/swap/1.cc b/libstdc++-v3/testsuite/tr1/6_containers/unordered_set/swap/1.cc
index 1928c9e1bdc..23d6f45c71c 100644
--- a/libstdc++-v3/testsuite/tr1/6_containers/unordered_set/swap/1.cc
+++ b/libstdc++-v3/testsuite/tr1/6_containers/unordered_set/swap/1.cc
@@ -30,8 +30,9 @@ void
 test01()
 {
   bool test __attribute__((unused)) = true;
-  using namespace std;
-  using namespace tr1;
+  using namespace std::tr1;
+  using std::equal_to;
+  using std::set;
 
   typedef __gnu_test::uneq_allocator<char> my_alloc;
   typedef unordered_set<char, hash<char>, equal_to<char>, my_alloc> my_uset;
diff --git a/libstdc++-v3/testsuite/tr1/6_containers/unordered_set/swap/2.cc b/libstdc++-v3/testsuite/tr1/6_containers/unordered_set/swap/2.cc
index 46e859cabac..dbcc31ceef8 100644
--- a/libstdc++-v3/testsuite/tr1/6_containers/unordered_set/swap/2.cc
+++ b/libstdc++-v3/testsuite/tr1/6_containers/unordered_set/swap/2.cc
@@ -30,8 +30,9 @@ void
 test01()
 {
   bool test __attribute__((unused)) = true;
-  using namespace std;
-  using namespace tr1;
+  using namespace std::tr1;
+  using std::equal_to;
+  using std::set;
 
   typedef __gnu_test::uneq_allocator<char> my_alloc;
   typedef unordered_set<char, hash<char>, equal_to<char>, my_alloc> my_uset;
diff --git a/libstdc++-v3/testsuite/tr1/6_containers/utility/pair.cc b/libstdc++-v3/testsuite/tr1/6_containers/utility/pair.cc
index c05665c66e3..fc4ce782df0 100644
--- a/libstdc++-v3/testsuite/tr1/6_containers/utility/pair.cc
+++ b/libstdc++-v3/testsuite/tr1/6_containers/utility/pair.cc
@@ -23,8 +23,8 @@
 #include <tr1/utility>
 #include <testsuite_hooks.h>
 
-using namespace std;
-using namespace tr1;
+using namespace std::tr1;
+using std::pair;
 
 struct blank_class
 { };