From 7ce56fc84562ebfb63d295dd6c471a8736d2694d Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Mon, 23 Jun 2014 23:12:31 +0100 Subject: any (any_v1): Rename namespace to fundamentals_v1. * include/experimental/any (any_v1): Rename namespace to fundamentals_v1. Change string returned by bad_any_cast::what(). * include/experimental/optional (fundamentals_v1): Add namespace. * include/experimental/string_view (fundamentals_v1): Likewise. * testsuite/experimental/any/typedefs.cc: New. * testsuite/experimental/optional/typedefs.cc: New. * testsuite/experimental/string_view/typedefs.cc: New. From-SVN: r211920 --- libstdc++-v3/ChangeLog | 9 ++++++ libstdc++-v3/include/experimental/any | 6 ++-- libstdc++-v3/include/experimental/optional | 3 ++ libstdc++-v3/include/experimental/string_view | 3 ++ .../testsuite/experimental/any/typedefs.cc | 30 ++++++++++++++++++ .../testsuite/experimental/optional/typedefs.cc | 33 ++++++++++++++++++++ .../testsuite/experimental/string_view/typedefs.cc | 36 ++++++++++++++++++++++ 7 files changed, 117 insertions(+), 3 deletions(-) create mode 100644 libstdc++-v3/testsuite/experimental/any/typedefs.cc create mode 100644 libstdc++-v3/testsuite/experimental/optional/typedefs.cc create mode 100644 libstdc++-v3/testsuite/experimental/string_view/typedefs.cc diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 9d344d1..d3c01f5 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -4,6 +4,7 @@ * include/std/chrono (_Checked_integral_constant): Allow zero. * testsuite/20_util/duration/literals/values.cc: Test non-positive values and digit separators. + * include/experimental/any PR libstdc++/61532 * testsuite/20_util/make_signed/requirements/typedefs-1.cc: Do not @@ -14,6 +15,14 @@ * testsuite/20_util/make_unsigned/requirements/typedefs-2.cc: Likewise. + * include/experimental/any (any_v1): Rename namespace to + fundamentals_v1. Change string returned by bad_any_cast::what(). + * include/experimental/optional (fundamentals_v1): Add namespace. + * include/experimental/string_view (fundamentals_v1): Likewise. + * testsuite/experimental/any/typedefs.cc: New. + * testsuite/experimental/optional/typedefs.cc: New. + * testsuite/experimental/string_view/typedefs.cc: New. + 2014-06-18 Paolo Carlini Ramana Radhakrishnan diff --git a/libstdc++-v3/include/experimental/any b/libstdc++-v3/include/experimental/any index 1e8d9b2..643fc23 100644 --- a/libstdc++-v3/include/experimental/any +++ b/libstdc++-v3/include/experimental/any @@ -47,7 +47,7 @@ namespace std _GLIBCXX_VISIBILITY(default) { namespace experimental { -inline namespace any_v1 +inline namespace fundamentals_v1 { _GLIBCXX_BEGIN_NAMESPACE_VERSION @@ -68,7 +68,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION class bad_any_cast : public bad_cast { public: - virtual const char* what() const noexcept { return "bad_any_cast"; } + virtual const char* what() const noexcept { return "bad any_cast"; } }; [[gnu::noreturn]] inline void __throw_bad_any_cast() @@ -604,7 +604,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // @} group any _GLIBCXX_END_NAMESPACE_VERSION -} // namespace any_v1 +} // namespace fundamentals_v1 } // namespace experimental } // namespace std diff --git a/libstdc++-v3/include/experimental/optional b/libstdc++-v3/include/experimental/optional index 2a3f29d..c68d7ea 100644 --- a/libstdc++-v3/include/experimental/optional +++ b/libstdc++-v3/include/experimental/optional @@ -52,6 +52,8 @@ namespace std _GLIBCXX_VISIBILITY(default) { namespace experimental { +inline namespace fundamentals_v1 +{ _GLIBCXX_BEGIN_NAMESPACE_VERSION /** @@ -797,6 +799,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // @} group optional _GLIBCXX_END_NAMESPACE_VERSION +} // namespace fundamentals_v1 } // [X.Y.12] diff --git a/libstdc++-v3/include/experimental/string_view b/libstdc++-v3/include/experimental/string_view index b54c9e8..4b1a107 100644 --- a/libstdc++-v3/include/experimental/string_view +++ b/libstdc++-v3/include/experimental/string_view @@ -46,6 +46,8 @@ namespace std _GLIBCXX_VISIBILITY(default) { namespace experimental { +inline namespace fundamentals_v1 +{ _GLIBCXX_BEGIN_NAMESPACE_VERSION /** @@ -582,6 +584,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION #endif _GLIBCXX_END_NAMESPACE_VERSION +} // namespace fundamentals_v1 } // namespace experimental diff --git a/libstdc++-v3/testsuite/experimental/any/typedefs.cc b/libstdc++-v3/testsuite/experimental/any/typedefs.cc new file mode 100644 index 0000000..a3f364d --- /dev/null +++ b/libstdc++-v3/testsuite/experimental/any/typedefs.cc @@ -0,0 +1,30 @@ +// { dg-options "-std=gnu++14" } +// { dg-do compile } + +// Copyright (C) 2014 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 moved_to of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +#include +#include +#include + +using check1_t = std::experimental::fundamentals_v1::any; +using check2_t = std::experimental::fundamentals_v1::bad_any_cast; + +static_assert(std::is_base_of::value, + "bad_any_cast must derive from bad_cast"); + diff --git a/libstdc++-v3/testsuite/experimental/optional/typedefs.cc b/libstdc++-v3/testsuite/experimental/optional/typedefs.cc new file mode 100644 index 0000000..2dee878 --- /dev/null +++ b/libstdc++-v3/testsuite/experimental/optional/typedefs.cc @@ -0,0 +1,33 @@ +// { dg-options "-std=gnu++14" } +// { dg-do compile } + +// Copyright (C) 2014 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 moved_to of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +#include +#include +#include + +template + using check1_t = std::experimental::fundamentals_v1::optional; + +using check2_t = std::experimental::fundamentals_v1::in_place_t; +using check3_t = std::experimental::fundamentals_v1::nullopt_t; +using check4_t = std::experimental::fundamentals_v1::bad_optional_access; + +static_assert(std::is_base_of::value, + "bad_optional_access must derive from logic_error"); diff --git a/libstdc++-v3/testsuite/experimental/string_view/typedefs.cc b/libstdc++-v3/testsuite/experimental/string_view/typedefs.cc new file mode 100644 index 0000000..f148a17 --- /dev/null +++ b/libstdc++-v3/testsuite/experimental/string_view/typedefs.cc @@ -0,0 +1,36 @@ +// { dg-options "-std=gnu++14" } +// { dg-do compile } + +// Copyright (C) 2014 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 moved_to of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +#include + +template + using check1_t = std::experimental::fundamentals_v1::basic_string_view; + +using check2_t = std::experimental::fundamentals_v1::string_view; + +#ifdef _GLIBCXX_USE_C99_STDINT_TR1 +using check3_t = std::experimental::fundamentals_v1::u16string_view; +using check4_t = std::experimental::fundamentals_v1::u32string_view; +#endif + +#ifdef _GLIBCXX_USE_WCHAR_T +using check5_t = std::experimental::fundamentals_v1::wstring_view; +#endif + -- cgit v1.1