]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
all_bound.cc: Disambiguate uses of TR1/C++0x facilities.
authorDouglas Gregor <doug.gregor@gmail.com>
Thu, 12 Jul 2007 14:33:38 +0000 (14:33 +0000)
committerDoug Gregor <dgregor@gcc.gnu.org>
Thu, 12 Jul 2007 14:33:38 +0000 (14:33 +0000)
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.

From-SVN: r126590

28 files changed:
libstdc++-v3/ChangeLog
libstdc++-v3/testsuite/tr1/3_function_objects/bind/all_bound.cc
libstdc++-v3/testsuite/tr1/3_function_objects/bind/nested.cc
libstdc++-v3/testsuite/tr1/3_function_objects/bind/placeholders.cc
libstdc++-v3/testsuite/tr1/6_containers/tuple/comparison_operators/comparisons.cc
libstdc++-v3/testsuite/tr1/6_containers/tuple/cons/assignment.cc
libstdc++-v3/testsuite/tr1/6_containers/tuple/cons/big_tuples.cc
libstdc++-v3/testsuite/tr1/6_containers/tuple/cons/constructor.cc
libstdc++-v3/testsuite/tr1/6_containers/tuple/creation_functions/23978.cc
libstdc++-v3/testsuite/tr1/6_containers/tuple/creation_functions/make_tuple.cc
libstdc++-v3/testsuite/tr1/6_containers/tuple/creation_functions/tie.cc
libstdc++-v3/testsuite/tr1/6_containers/tuple/element_access/get.cc
libstdc++-v3/testsuite/tr1/6_containers/tuple/tuple_element.cc
libstdc++-v3/testsuite/tr1/6_containers/tuple/tuple_size.cc
libstdc++-v3/testsuite/tr1/6_containers/unordered_map/24064.cc
libstdc++-v3/testsuite/tr1/6_containers/unordered_map/requirements/explicit_instantiation.cc
libstdc++-v3/testsuite/tr1/6_containers/unordered_map/swap/1.cc
libstdc++-v3/testsuite/tr1/6_containers/unordered_map/swap/2.cc
libstdc++-v3/testsuite/tr1/6_containers/unordered_multimap/requirements/explicit_instantiation.cc
libstdc++-v3/testsuite/tr1/6_containers/unordered_multimap/swap/1.cc
libstdc++-v3/testsuite/tr1/6_containers/unordered_multimap/swap/2.cc
libstdc++-v3/testsuite/tr1/6_containers/unordered_multiset/requirements/explicit_instantiation.cc
libstdc++-v3/testsuite/tr1/6_containers/unordered_multiset/swap/1.cc
libstdc++-v3/testsuite/tr1/6_containers/unordered_multiset/swap/2.cc
libstdc++-v3/testsuite/tr1/6_containers/unordered_set/requirements/explicit_instantiation.cc
libstdc++-v3/testsuite/tr1/6_containers/unordered_set/swap/1.cc
libstdc++-v3/testsuite/tr1/6_containers/unordered_set/swap/2.cc
libstdc++-v3/testsuite/tr1/6_containers/utility/pair.cc

index 3da113050e029652862062906f303ac8559829ea..8daf74a04a8b572479f88adb8923d3973c352b81 100644 (file)
@@ -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
index 9d973cf80060df6a94363ac79866576186b59f51..20c6d7a2397cd2bc1495079d3cb31711c0c84b45 100644 (file)
@@ -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()
index 15b890ccf4b9c38ebe97b63c41a74a4cb7aae723..a5db8b34368242360e6ea33f24ca37d72a8cfa3d 100644 (file)
@@ -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()
index 53e021a9c98208b4f62f74e8efe9fe43d3ea0746..1d07a79829605110c86ffd733e4ab374c66b0e05 100644 (file)
@@ -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()
index 2b8e231f6fff5a0ce20f8811627ee35886d235da..f22d975c86b43199a432afef78c33a07f3077add 100644 (file)
@@ -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) )
 
index c145191678b7fde112b27067e7b5f050c3e2c708..6207b41f9dfe1ce34ddb67b7cbc7a93e1a40c29a 100644 (file)
@@ -23,8 +23,7 @@
 #include <tr1/tuple>
 #include <testsuite_hooks.h>
 
-using namespace std;
-using namespace tr1;
+using namespace std::tr1;
 
 int
 main()
index de2784a9c3949f90ba4cc7b0d9cfcb1234d5a8cd..a23ad8dbc74e38e05519f79ed9db44fc4743061d 100644 (file)
@@ -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
index a869ac373100896086b286f3fbf40e06c887da13..89e9a113ffa10952d673a060a33a308fd74b79f0 100644 (file)
@@ -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()
index 2c94f3314dd72768e7c4bb637dab147891799f38..70a2cf8c6bd885385caf84c0c2ac360b32791fef 100644 (file)
@@ -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()
index a599b7ec7b6c34920c0c7730a61e624d9a2edeb3..ca69be21f0e0ff262314b50874e5eff95148fe77 100644 (file)
@@ -24,8 +24,7 @@
 #include <tr1/functional>
 #include <testsuite_hooks.h>
 
-using namespace std;
-using namespace tr1;
+using namespace std::tr1;
 
 int
 main()
index c3c40e5de677ab7e69ebb79f2b608740fcab99a9..ea63a5d5c6a49e47e9c2932a629b96a90096e0d9 100644 (file)
@@ -23,8 +23,7 @@
 #include <tr1/tuple>
 #include <testsuite_hooks.h>
 
-using namespace std;
-using namespace tr1;
+using namespace std::tr1;
 
 int
 main()
index 7970d1fab5e38066228cd9ace872c9284ae27b1b..85ec6cb10dc13f6e05aa15cfbd59f4cf0aab5f84 100644 (file)
@@ -23,8 +23,7 @@
 #include <tr1/tuple>
 #include <testsuite_hooks.h>
 
-using namespace std;
-using namespace tr1;
+using namespace std::tr1;
 
 int
 main()
index 53bc46dd951ed59942fc4d96074a264864065f3e..44a93171e8502a6a034d1a666573a1284dd6e44c 100644 (file)
@@ -23,8 +23,7 @@
 #include <tr1/tuple>
 #include <testsuite_hooks.h>
 
-using namespace std;
-using namespace tr1;
+using namespace std::tr1;
 
 struct foo
 { };
index b868b35696832ee0ad39da2f4308fd0bedc2c6fd..967cb43d95cc7ffc7f24b90749d4829256f182c6 100644 (file)
@@ -23,8 +23,7 @@
 #include <tr1/tuple>
 #include <testsuite_hooks.h>
 
-using namespace std;
-using namespace tr1;
+using namespace std::tr1;
 
 int
 main()
index aaacb70a0f593af1f41d0fddda7f98ffce210d0f..b9f9bd2849cd611fb55dec7f1c749e0ce5724afe 100644 (file)
@@ -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;
index 8fb0b9f3b62bb493c14fff5fd2bb1216e1c566dd..865ca37bd44834849d90da8f2f269db186ec07ed 100644 (file)
 #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,
index d379774926d2cb6d15b6228af44f87d4491516d0..3533aab61fa30df5ddcd36cfd5f5fac4ac6a55f1 100644 (file)
@@ -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;
index 8d708292ae3447e675097f9f28fadaca2d19c262..acd742e6e6aa3b83ec2802bbc8205342017cef76 100644 (file)
@@ -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;
index 5433e0efa916722e778afdf0f35af4f53fa059ba..0bfec766c065a6287885c1f7d39dfe07d859e93c 100644 (file)
 #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,
index 7648e08bd6260fd90290e5fb383885c9f4ea8712..2fd0cab7da86e6cb78742cd504999a90d9990914 100644 (file)
@@ -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;
index f7744ebe854a9e38f20aa76334360fe2442ac802..249cc560e95ad7b8656e6aa0812ccd171547a47f 100644 (file)
@@ -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;
index 4389e1b805e0e6aab47fb31c742e325aceaa0587..13d20fa7fbefbd373a8e4734f9dc905885e5b596 100644 (file)
@@ -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>,
index ca0194e337520681bd7c4707ab14a40804ecc9c3..a19ddd6a521e99a145ac649fb81836357315510e 100644 (file)
@@ -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>
index a95ddd51fc8c927fe9e66f488cf15e1ea55b218e..5da6e28d037967113238bd36c2a41d0564c88d9f 100644 (file)
@@ -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>
index a006abfcbb497e0f6308243709ddbd6b6b0f7f19..503e27a373ca7fef08b00b28216f1bf535efe458 100644 (file)
@@ -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>,
index 1928c9e1bdc3165eadf2369106d733f8e8ca5b8c..23d6f45c71cc0dd67a606d2f107578e3feda3c0e 100644 (file)
@@ -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;
index 46e859cabacb832305bc8a67198e3fdad6ba2d05..dbcc31ceef82fc373f2e633cbc0fe7aa5d211ba9 100644 (file)
@@ -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;
index c05665c66e3c0152f540e260895940f25c5b2d50..fc4ce782df0ab755625951fb7ecc4bf4db54da5f 100644 (file)
@@ -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
 { };