[patch] Adjust some libstdc++ tests

[Jonathan Wakely]

Also tweak a comment and whitespace.

Tested x86_64-linux, committed to trunk.


-------------- next part --------------
commit c0539972b28657267c3c0f91be0f0cf9ad1ab56f
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Sun Jan 26 10:50:29 2014 +0000

    	* include/bits/stl_map.h: Remove anachronistic comment.
    	* include/bits/stl_multimap.h: Add whitespace.
    	* testsuite/23_containers/map/modifiers/emplace/1.cc: Use
    	-std=gnu++11 instead of -std=c++11.
    	* testsuite/23_containers/map/operators/2.cc: Likewise.
    	* testsuite/23_containers/multimap/modifiers/emplace/1.cc: Likewise.
    	* testsuite/23_containers/multiset/modifiers/emplace/1.cc: Likewise.
    	* testsuite/23_containers/set/modifiers/emplace/1.cc: Likewise.

diff --git a/libstdc++-v3/include/bits/stl_map.h b/libstdc++-v3/include/bits/stl_map.h
index fa121e2..334c54f 100644
--- a/libstdc++-v3/include/bits/stl_map.h
+++ b/libstdc++-v3/include/bits/stl_map.h
@@ -154,8 +154,8 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
       typedef typename _Rep_type::const_reverse_iterator const_reverse_iterator;
 
       // [23.3.1.1] construct/copy/destroy
-      // (get_allocator() is normally listed in this section, but seems to have
-      // been accidentally omitted in the printed standard)
+      // (get_allocator() is also listed in this section)
+
       /**
        *  @brief  Default constructor creates no elements.
        */
diff --git a/libstdc++-v3/include/bits/stl_multimap.h b/libstdc++-v3/include/bits/stl_multimap.h
index e4575c1..c7b80c9 100644
--- a/libstdc++-v3/include/bits/stl_multimap.h
+++ b/libstdc++-v3/include/bits/stl_multimap.h
@@ -153,6 +153,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
 
       // [23.3.2] construct/copy/destroy
       // (get_allocator() is also listed in this section)
+
       /**
        *  @brief  Default constructor creates no elements.
        */
diff --git a/libstdc++-v3/testsuite/23_containers/map/modifiers/emplace/1.cc b/libstdc++-v3/testsuite/23_containers/map/modifiers/emplace/1.cc
index fb05547..44543f5 100644
--- a/libstdc++-v3/testsuite/23_containers/map/modifiers/emplace/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/map/modifiers/emplace/1.cc
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++11" }
+// { dg-options "-std=gnu++11" }
 
 // Copyright (C) 2012-2014 Free Software Foundation, Inc.
 //
diff --git a/libstdc++-v3/testsuite/23_containers/map/operators/2.cc b/libstdc++-v3/testsuite/23_containers/map/operators/2.cc
index 850eda9..53c1adb 100644
--- a/libstdc++-v3/testsuite/23_containers/map/operators/2.cc
+++ b/libstdc++-v3/testsuite/23_containers/map/operators/2.cc
@@ -17,7 +17,7 @@
 
 // This test verifies that the value type of a map need not be default copyable.
 
-// { dg-options "-std=c++11" }
+// { dg-options "-std=gnu++11" }
 
 #include <map>
 #include <testsuite_hooks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/multimap/modifiers/emplace/1.cc b/libstdc++-v3/testsuite/23_containers/multimap/modifiers/emplace/1.cc
index dfdf621..fa98f43 100644
--- a/libstdc++-v3/testsuite/23_containers/multimap/modifiers/emplace/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/multimap/modifiers/emplace/1.cc
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++11" }
+// { dg-options "-std=gnu++11" }
 
 // Copyright (C) 2012-2014 Free Software Foundation, Inc.
 //
diff --git a/libstdc++-v3/testsuite/23_containers/multiset/modifiers/emplace/1.cc b/libstdc++-v3/testsuite/23_containers/multiset/modifiers/emplace/1.cc
index d6b738e..a013ef7 100644
--- a/libstdc++-v3/testsuite/23_containers/multiset/modifiers/emplace/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/multiset/modifiers/emplace/1.cc
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++11" }
+// { dg-options "-std=gnu++11" }
 
 // Copyright (C) 2012-2014 Free Software Foundation, Inc.
 //
diff --git a/libstdc++-v3/testsuite/23_containers/set/modifiers/emplace/1.cc b/libstdc++-v3/testsuite/23_containers/set/modifiers/emplace/1.cc
index ab6d436..12ea12e 100644
--- a/libstdc++-v3/testsuite/23_containers/set/modifiers/emplace/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/set/modifiers/emplace/1.cc
@@ -1,4 +1,4 @@
-// { dg-options "-std=c++11" }
+// { dg-options "-std=gnu++11" }
 
 // Copyright (C) 2012-2014 Free Software Foundation, Inc.
 //