re PR libstdc++/61269 (<type_traits> includes <cstdint> inside std namespace)

	PR libstdc++/61269
	* include/std/type_traits: Move include outside namespace std.
	* testsuite/20_util/declval/requirements/1_neg.cc: Adjust dg-error.
	* testsuite/20_util/make_signed/requirements/typedefs_neg.cc: Likewise.
	* testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc:
	Likewise.

From-SVN: r210715

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index bc84abd34a0150f4ac5a82a3d6e01515a8244417..4dfc38095f16ceee91416443e13c830d588b73c2 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,12 @@
+2014-05-21  Jonathan Wakely  <jwakely@redhat.com>
+
+       PR libstdc++/61269
+       * include/std/type_traits: Move include outside namespace std.
+       * testsuite/20_util/declval/requirements/1_neg.cc: Adjust dg-error.
+       * testsuite/20_util/make_signed/requirements/typedefs_neg.cc: Likewise.
+       * testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc:
+       Likewise.
+
 2014-05-21  John Marino  <gnugcc@marino.st>
 
        * acinclude.m4 (*-*-dragonfly*): New target.

diff --git a/libstdc++-v3/include/std/type_traits b/libstdc++-v3/include/std/type_traits
index 0eacd36a118365bcf5dcebfef8b31486be57337b..1ff2e625a73257a934c5573cf35065b7f9000e2b 100644 (file)
--- a/libstdc++-v3/include/std/type_traits
+++ b/libstdc++-v3/include/std/type_traits
@@ -37,19 +37,22 @@
 
 #include <bits/c++config.h>
 
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
 #ifdef _GLIBCXX_USE_C99_STDINT_TR1
 # if defined (__UINT_LEAST16_TYPE__) && defined(__UINT_LEAST32_TYPE__)
+namespace std
+{
   typedef __UINT_LEAST16_TYPE__ uint_least16_t;
   typedef __UINT_LEAST32_TYPE__ uint_least32_t;
+}
 # else
 #  include <cstdint>
 # endif
 #endif
 
+namespace std _GLIBCXX_VISIBILITY(default)
+{
+_GLIBCXX_BEGIN_NAMESPACE_VERSION
+
   /**
    * @defgroup metaprogramming Metaprogramming
    * @ingroup utilities

diff --git a/libstdc++-v3/testsuite/20_util/declval/requirements/1_neg.cc b/libstdc++-v3/testsuite/20_util/declval/requirements/1_neg.cc
index 6be3af05ade9a1643e34d14dc2fd120b9e5db4fb..04e6b711906dc4cfab15d09e6dff871ff4eac968 100644 (file)
--- a/libstdc++-v3/testsuite/20_util/declval/requirements/1_neg.cc
+++ b/libstdc++-v3/testsuite/20_util/declval/requirements/1_neg.cc
@@ -19,7 +19,7 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-error "static assertion failed" "" { target *-*-* } 2033 }
+// { dg-error "static assertion failed" "" { target *-*-* } 2036 }
 
 #include <utility>
 

diff --git a/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs_neg.cc b/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs_neg.cc
index 77f8bb3aadd8696dee0998705a1fd2204b4ead57..d711546050de5c29e69da78cc1354e8352d0ce2c 100644 (file)
--- a/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs_neg.cc
+++ b/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs_neg.cc
@@ -48,5 +48,5 @@ void test01()
 // { dg-error "required from here" "" { target *-*-* } 40 }
 // { dg-error "required from here" "" { target *-*-* } 42 }
 
-// { dg-error "invalid use of incomplete type" "" { target *-*-* } 1744 }
-// { dg-error "declaration of" "" { target *-*-* } 1708 }
+// { dg-error "invalid use of incomplete type" "" { target *-*-* } 1747 }
+// { dg-error "declaration of" "" { target *-*-* } 1711 }

diff --git a/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc b/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc
index 48ee22557185b55282e8d6cac12236fb70f6bd8a..c77205be01d9723a807e4711887d42abba95c021 100644 (file)
--- a/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc
+++ b/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc
@@ -48,5 +48,5 @@ void test01()
 // { dg-error "required from here" "" { target *-*-* } 40 }
 // { dg-error "required from here" "" { target *-*-* } 42 }
 
-// { dg-error "invalid use of incomplete type" "" { target *-*-* } 1647 }
-// { dg-error "declaration of" "" { target *-*-* } 1611 }
+// { dg-error "invalid use of incomplete type" "" { target *-*-* } 1650 }
+// { dg-error "declaration of" "" { target *-*-* } 1614 }