procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
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
This commit is contained in:
Jonathan Wakely 2014-05-21 16:09:37 +01:00 • committed by Jonathan Wakely
parent 19ce781984
commit 21e2806a8f
5 changed files with 21 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
libstdc++-v3/ChangeLog
View file

@ -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.

11
libstdc++-v3/include/std/type_traits
View file

@ -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

2
libstdc++-v3/testsuite/20_util/declval/requirements/1_neg.cc
View file

@ -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>

4
libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs_neg.cc
View file

@ -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 }

4
libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc
View file

@ -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 }