Simplify and clean up library literals.

2013-06-07  Ed Smith-Rowland  <3dw4rd@verizon.net>

	Simplify and clean up library literals.
	* include/std/chrono: Simplify namespace and versioning management.
	* include/bits/basic_string.h: Ditto.
	* testsuite/20_util/duration/literals/types.cc: Remove bogus comment.
	* testsuite/20_util/duration/literals/values.cc: Ditto.
	* testsuite/21_strings/basic_string/literals/types.cc: Ditto.
	* testsuite/21_strings/basic_string/literals/values.cc: Ditto.

From-SVN: r199861

libstdc++-v3/ChangeLog

 2013-06-08  Ed Smith-Rowland  <3dw4rd@verizon.net>
 
+	Simplify and clean up library literals.
+	* include/std/chrono: Simplify namespace and versioning management.
+	* include/bits/basic_string.h: Ditto.
+	* testsuite/20_util/duration/literals/types.cc: Remove bogus comment.
+	* testsuite/20_util/duration/literals/values.cc: Ditto.
+	* testsuite/21_strings/basic_string/literals/types.cc: Ditto.
+	* testsuite/21_strings/basic_string/literals/values.cc: Ditto.
+
+2013-06-08  Ed Smith-Rowland  <3dw4rd@verizon.net>
+
 	Implement N3654 - Quoted Strings Library Proposal
 	* include/std/iomanip: Add quoted(String, Char delim, Char escape)
 	manipulators and supporting machinery in c++1y mode.

libstdc++-v3/include/bits/basic_string.h

@@ -3103,17 +3103,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
     { };
 #endif
 
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
 #if __cplusplus > 201103L
 
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-inline namespace literals {
-inline namespace string_literals {
+  inline namespace literals {
+  inline namespace string_literals {
 
     inline basic_string<char>
     operator"" s(const char* __str, size_t __len)
@@ -3135,14 +3128,14 @@ inline namespace string_literals {
     { return basic_string<char32_t>{__str, __len}; }
 #endif
 
-} // inline namespace string_literals
-} // inline namespace literals
+  } // inline namespace string_literals
+  } // inline namespace literals
+
+#endif // __cplusplus > 201103L
 
 _GLIBCXX_END_NAMESPACE_VERSION
 } // namespace std
 
-#endif // __cplusplus > 201103L
-
 #endif // C++11
 
 #endif /* _BASIC_STRING_H */

libstdc++-v3/include/std/chrono

@@ -780,23 +780,10 @@ _GLIBCXX_END_NAMESPACE_VERSION
   _GLIBCXX_END_NAMESPACE_VERSION
   } // namespace chrono
 
-  // @} group chrono
-} // namespace
-
-#endif //_GLIBCXX_USE_C99_STDINT_TR1
-
-#endif // C++11
-
 #if __cplusplus > 201103L
 
-#ifdef _GLIBCXX_USE_C99_STDINT_TR1
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-inline namespace literals {
-inline namespace chrono_literals {
+  inline namespace literals {
+  inline namespace chrono_literals {
 
     namespace __detail {
 
@@ -909,14 +896,16 @@ inline namespace chrono_literals {
 			  chrono::nanoseconds>::value;
       }
 
-} // inline namespace chrono_literals
-} // inline namespace literals
+  } // inline namespace chrono_literals
+  } // inline namespace literals
 
-_GLIBCXX_END_NAMESPACE_VERSION
+#endif // __cplusplus > 201103L
+
+  // @} group chrono
 } // namespace std
 
 #endif //_GLIBCXX_USE_C99_STDINT_TR1
 
-#endif // __cplusplus > 201103L
+#endif // C++11
 
 #endif //_GLIBCXX_CHRONO

libstdc++-v3/testsuite/20_util/duration/literals/types.cc

@@ -18,10 +18,6 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// NOTE: This makes use of the fact that we know how moveable
-// is implemented on string (via swap). If the implementation changed
-// this test may begin to fail.
-
 #include <chrono>
 #include <type_traits>
 

libstdc++-v3/testsuite/20_util/duration/literals/values.cc

@@ -18,10 +18,6 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// NOTE: This makes use of the fact that we know how moveable
-// is implemented on string (via swap). If the implementation changed
-// this test may begin to fail.
-
 #include <chrono>
 #include <testsuite_hooks.h>
 

libstdc++-v3/testsuite/21_strings/basic_string/literals/types.cc

@@ -18,10 +18,6 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// NOTE: This makes use of the fact that we know how moveable
-// is implemented on string (via swap). If the implementation changed
-// this test may begin to fail.
-
 #include <string>
 #include <type_traits>
 

libstdc++-v3/testsuite/21_strings/basic_string/literals/values.cc

@@ -18,10 +18,6 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// NOTE: This makes use of the fact that we know how moveable
-// is implemented on string (via swap). If the implementation changed
-// this test may begin to fail.
-
 #include <string>
 #include <testsuite_hooks.h>