libstdc++: Fix versioned namespace tests

	* testsuite/23_containers/map/48101_neg.cc: Add versioned namespace
	pattern to tested error message.
	* testsuite/23_containers/multimap/48101_neg.cc: Likewise.
	* testsuite/30_threads/headers/stop_token/synopsis.cc: Add
	dg-require-normal-namepace.

From-SVN: r279641

libstdc++-v3/ChangeLog

 2019-12-20  François Dumont  <fdumont@gcc.gnu.org>
 
+	* testsuite/23_containers/map/48101_neg.cc: Add versioned namespace
+	pattern to tested error message.
+	* testsuite/23_containers/multimap/48101_neg.cc: Likewise.
+	* testsuite/30_threads/headers/stop_token/synopsis.cc: Add
+	dg-require-normal-namepace.
+
 	* python/libstdcxx/v6/printers.py (lookup_node_type): Remove redundant
 	call to lookup_node_type.
 	* testsuite/libstdc++-prettyprinters/80276.cc: Define

libstdc++-v3/testsuite/23_containers/map/48101_neg.cc

@@ -29,8 +29,8 @@ test01()
   c2.find(2); // { dg-error "here" }
 }
 
-// { dg-error "_Compare = std::less<int.>" "" { target *-*-* } 0 }
-// { dg-error "_Compare = std::allocator<int>" "" { target *-*-* } 0 }
+// { dg-error "_Compare = std::(__8::)?less<int.>" "" { target *-*-* } 0 }
+// { dg-error "_Compare = std::(__8::)?allocator<int>" "" { target *-*-* } 0 }
 // { dg-error "comparison object must be invocable" "" { target *-*-* } 0 }
 // { dg-prune-output "no match for call" }
 // { dg-prune-output "invalid conversion" }

libstdc++-v3/testsuite/23_containers/multimap/48101_neg.cc

@@ -29,8 +29,8 @@ test01()
   c2.find(2); // { dg-error "here" }
 }
 
-// { dg-error "_Compare = std::less<int.>" "" { target *-*-* } 0 }
-// { dg-error "_Compare = std::allocator<int>" "" { target *-*-* } 0 }
+// { dg-error "_Compare = std::(__8::)?less<int.>" "" { target *-*-* } 0 }
+// { dg-error "_Compare = std::(__8::)?allocator<int>" "" { target *-*-* } 0 }
 // { dg-error "comparison object must be invocable" "" { target *-*-* } 0 }
 // { dg-prune-output "no match for call" }
 // { dg-prune-output "invalid conversion" }

libstdc++-v3/testsuite/30_threads/headers/stop_token/synopsis.cc

@@ -17,6 +17,7 @@
 
 // { dg-options "-std=gnu++2a" }
 // { dg-do compile { target c++2a } }
+// { dg-require-normal-namespace "" }
 
 #include <stop_token>