From 899e00ebb25c3cc6bf87bded44e217ce8c81ed9c Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Tue, 11 Jun 2013 09:50:55 +0000 Subject: [PATCH] re PR libstdc++/56019 (max_align_t should be in std namespace) 2013-06-11 Paolo Carlini PR libstdc++/56019 * include/c_global/cstddef (max_align_t): Add to namespace std. * include/c_std/cstddef: Likewise. * testsuite/18_support/max_align_t/requirements/1.cc: New. * testsuite/18_support/max_align_t/requirements/2.cc: Likewise. From-SVN: r199945 --- libstdc++-v3/ChangeLog | 8 ++++++++ libstdc++-v3/include/c_global/cstddef | 13 ++++++++++++ libstdc++-v3/include/c_std/cstddef | 8 ++++++++ .../18_support/max_align_t/requirements/1.cc | 23 +++++++++++++++++++++ .../18_support/max_align_t/requirements/2.cc | 24 ++++++++++++++++++++++ 5 files changed, 76 insertions(+) create mode 100644 libstdc++-v3/testsuite/18_support/max_align_t/requirements/1.cc create mode 100644 libstdc++-v3/testsuite/18_support/max_align_t/requirements/2.cc diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index ec9bfd2..60bc7b5 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,11 @@ +2013-06-11 Paolo Carlini + + PR libstdc++/56019 + * include/c_global/cstddef (max_align_t): Add to namespace std. + * include/c_std/cstddef: Likewise. + * testsuite/18_support/max_align_t/requirements/1.cc: New. + * testsuite/18_support/max_align_t/requirements/2.cc: Likewise. + 2013-06-10 Benjamin Kosnik * include/bits/c++config (_GLIBCXX_ABI_TAG_CXX11): Add. diff --git a/libstdc++-v3/include/c_global/cstddef b/libstdc++-v3/include/c_global/cstddef index 00660f3..94d8957 100644 --- a/libstdc++-v3/include/c_global/cstddef +++ b/libstdc++-v3/include/c_global/cstddef @@ -36,7 +36,20 @@ // ISO C++ 14882: 18.1 Types // +#ifndef _GLIBCXX_CSTDDEF +#define _GLIBCXX_CSTDDEF 1 + #pragma GCC system_header #include #include + +#if __cplusplus >= 201103L +namespace std +{ + // We handle size_t, ptrdiff_t, and nullptr_t in c++config.h. + using ::max_align_t; +} +#endif + +#endif // _GLIBCXX_CSTDDEF diff --git a/libstdc++-v3/include/c_std/cstddef b/libstdc++-v3/include/c_std/cstddef index 9500bc5..6f1b5bd 100644 --- a/libstdc++-v3/include/c_std/cstddef +++ b/libstdc++-v3/include/c_std/cstddef @@ -44,4 +44,12 @@ #include #include +#if __cplusplus >= 201103L +namespace std +{ + // We handle size_t, ptrdiff_t, and nullptr_t in c++config.h. + using ::max_align_t; +} #endif + +#endif // _GLIBCXX_CSTDDEF diff --git a/libstdc++-v3/testsuite/18_support/max_align_t/requirements/1.cc b/libstdc++-v3/testsuite/18_support/max_align_t/requirements/1.cc new file mode 100644 index 0000000..405e097 --- /dev/null +++ b/libstdc++-v3/testsuite/18_support/max_align_t/requirements/1.cc @@ -0,0 +1,23 @@ +// { dg-do compile } +// { dg-options "-std=gnu++11" } +// +// Copyright (C) 2013 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +#include + +std::max_align_t t; diff --git a/libstdc++-v3/testsuite/18_support/max_align_t/requirements/2.cc b/libstdc++-v3/testsuite/18_support/max_align_t/requirements/2.cc new file mode 100644 index 0000000..d702720 --- /dev/null +++ b/libstdc++-v3/testsuite/18_support/max_align_t/requirements/2.cc @@ -0,0 +1,24 @@ +// { dg-do compile } +// { dg-options "-std=gnu++11" } +// +// Copyright (C) 2013 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +#include +#include + +static_assert (std::is_pod::value, ""); -- 2.7.4