From: Jonathan Wakely Date: Mon, 3 Oct 2016 14:42:06 +0000 (+0100) Subject: Fix libstdc++ versioned namespace build X-Git-Tag: releases/gcc-5.5.0~793 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d0e9e0b166b087df9654d906ac5c1287fd7c28c4;p=thirdparty%2Fgcc.git Fix libstdc++ versioned namespace build PR libstdc++/68323 PR libstdc++/77794 * config/abi/pre/gnu-versioned-namespace.ver: Add export for __cxa_thread_atexit. * include/Makefile.am: Add * include/Makefile.in: Regenerate. * src/filesystem/Makefile.in: Likewise. * include.bits/basic_string.h: Fix nesting of versioned namespaces. * include/bits/c++config: Declare versioned namespaces for literals. * include/bits/regex.h (basic_regex, match_results): Add workarounds for PR c++/59256. * include/bits/uniform_int_dist.h: Fix nesting of versioned namespace. * include/std/chrono: Likewise. * include/std/complex: Likewise. * include/experimental/fs_fwd.h: Declare versioned namespace. * include/experimental/lfts_config.h: Declare versioned namespaces. * include/experimental/algorithm: Include . * include/experimental/any: Likewise. * include/experimental/chrono: Likewise. * include/experimental/functional: Likewise. * include/experimental/optional: Likewise. * include/experimental/ratio: Likewise. * include/experimental/system_error: Likewise. * include/experimental/tuple: Likewise. * include/experimental/type_traits: Likewise. * include/experimental/string_view: Likewise. Fix nesting of versioned namespaces. * include/experimental/string_view.tcc: Reopen inline namespace for non-inline function definitions. * testsuite/17_intro/using_namespace_std_exp_neg.cc: New test. * testsuite/20_util/duration/literals/range.cc: Adjust dg-error line. * testsuite/experimental/any/misc/any_cast_neg.cc: Likewise. * testsuite/ext/profile/mutex_extensions_neg.cc: Likewise. From-SVN: r240720 --- diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 95f754522ec7..4c61b56ec67a 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,40 @@ +2016-10-03 Jonathan Wakely + + PR libstdc++/68323 + PR libstdc++/77794 + * config/abi/pre/gnu-versioned-namespace.ver: Add export for + __cxa_thread_atexit. + * include/Makefile.am: Add + * include/Makefile.in: Regenerate. + * src/filesystem/Makefile.in: Likewise. + * include.bits/basic_string.h: Fix nesting of versioned namespaces. + * include/bits/c++config: Declare versioned namespaces for literals. + * include/bits/regex.h (basic_regex, match_results): Add workarounds + for PR c++/59256. + * include/bits/uniform_int_dist.h: Fix nesting of versioned namespace. + * include/std/chrono: Likewise. + * include/std/complex: Likewise. + * include/experimental/fs_fwd.h: Declare versioned namespace. + * include/experimental/lfts_config.h: Declare versioned namespaces. + * include/experimental/algorithm: Include + . + * include/experimental/any: Likewise. + * include/experimental/chrono: Likewise. + * include/experimental/functional: Likewise. + * include/experimental/optional: Likewise. + * include/experimental/ratio: Likewise. + * include/experimental/system_error: Likewise. + * include/experimental/tuple: Likewise. + * include/experimental/type_traits: Likewise. + * include/experimental/string_view: Likewise. Fix nesting of + versioned namespaces. + * include/experimental/string_view.tcc: Reopen inline namespace for + non-inline function definitions. + * testsuite/17_intro/using_namespace_std_exp_neg.cc: New test. + * testsuite/20_util/duration/literals/range.cc: Adjust dg-error line. + * testsuite/experimental/any/misc/any_cast_neg.cc: Likewise. + * testsuite/ext/profile/mutex_extensions_neg.cc: Likewise. + 2016-09-28 Jonathan Wakely PR libstdc++/77686 diff --git a/libstdc++-v3/config/abi/pre/gnu-versioned-namespace.ver b/libstdc++-v3/config/abi/pre/gnu-versioned-namespace.ver index 6bf8e9b8b446..9666678ee369 100644 --- a/libstdc++-v3/config/abi/pre/gnu-versioned-namespace.ver +++ b/libstdc++-v3/config/abi/pre/gnu-versioned-namespace.ver @@ -186,6 +186,7 @@ CXXABI_2.0 { __cxa_guard_release; __cxa_pure_virtual; __cxa_rethrow; + __cxa_thread_atexit; __cxa_throw; __cxa_type_match; __cxa_vec_cctor; diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am index 5b6b4eb90630..5a3b1891bdb1 100644 --- a/libstdc++-v3/include/Makefile.am +++ b/libstdc++-v3/include/Makefile.am @@ -649,6 +649,7 @@ experimental_headers = \ ${experimental_srcdir}/any \ ${experimental_srcdir}/chrono \ ${experimental_srcdir}/functional \ + ${experimental_srcdir}/lfts_config.h \ ${experimental_srcdir}/optional \ ${experimental_srcdir}/ratio \ ${experimental_srcdir}/string_view \ diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in index 02b3ae846c88..591301add5fc 100644 --- a/libstdc++-v3/include/Makefile.in +++ b/libstdc++-v3/include/Makefile.in @@ -938,6 +938,7 @@ experimental_headers = \ ${experimental_srcdir}/any \ ${experimental_srcdir}/chrono \ ${experimental_srcdir}/functional \ + ${experimental_srcdir}/lfts_config.h \ ${experimental_srcdir}/optional \ ${experimental_srcdir}/ratio \ ${experimental_srcdir}/string_view \ diff --git a/libstdc++-v3/include/bits/basic_string.h b/libstdc++-v3/include/bits/basic_string.h index 4020dcb2e297..9e3aec0940a5 100644 --- a/libstdc++-v3/include/bits/basic_string.h +++ b/libstdc++-v3/include/bits/basic_string.h @@ -5626,6 +5626,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { }; #endif +_GLIBCXX_END_NAMESPACE_VERSION + #if __cplusplus > 201103L #define __cpp_lib_string_udls 201304 @@ -5634,6 +5636,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { inline namespace string_literals { +_GLIBCXX_BEGIN_NAMESPACE_VERSION _GLIBCXX_DEFAULT_ABI_TAG inline basic_string @@ -5659,12 +5662,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { return basic_string{__str, __len}; } #endif +_GLIBCXX_END_NAMESPACE_VERSION } // inline namespace string_literals } // inline namespace literals #endif // __cplusplus > 201103L -_GLIBCXX_END_NAMESPACE_VERSION } // namespace std #endif // C++11 diff --git a/libstdc++-v3/include/bits/c++config b/libstdc++-v3/include/bits/c++config index 79d1b368d4c6..662dbf8dfec9 100644 --- a/libstdc++-v3/include/bits/c++config +++ b/libstdc++-v3/include/bits/c++config @@ -177,8 +177,11 @@ namespace placeholders { } namespace regex_constants { } namespace this_thread { } - - namespace experimental { } + inline namespace literals { + inline namespace chrono_literals { } + inline namespace complex_literals { } + inline namespace string_literals { } + } } namespace abi { } @@ -263,7 +266,11 @@ namespace std namespace regex_constants { inline namespace __7 { } } namespace this_thread { inline namespace __7 { } } - namespace experimental { inline namespace __7 { } } + inline namespace literals { + inline namespace chrono_literals { inline namespace __7 { } } + inline namespace complex_literals { inline namespace __7 { } } + inline namespace string_literals { inline namespace __7 { } } + } namespace __detail { inline namespace __7 { } } } diff --git a/libstdc++-v3/include/bits/regex.h b/libstdc++-v3/include/bits/regex.h index a23c2c9b3cee..9b26c8f465df 100644 --- a/libstdc++-v3/include/bits/regex.h +++ b/libstdc++-v3/include/bits/regex.h @@ -769,10 +769,13 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11 template - friend bool - __detail::__regex_algo_impl(_Bp, _Bp, match_results<_Bp, _Ap>&, - const basic_regex<_Cp, _Rp>&, - regex_constants::match_flag_type); + friend bool __detail:: +#if _GLIBCXX_INLINE_VERSION + __7:: // Required due to PR c++/59256 +#endif + __regex_algo_impl(_Bp, _Bp, match_results<_Bp, _Ap>&, + const basic_regex<_Cp, _Rp>&, + regex_constants::match_flag_type); template friend class __detail::_Executor; @@ -1860,10 +1863,13 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11 template - friend bool - __detail::__regex_algo_impl(_Bp, _Bp, match_results<_Bp, _Ap>&, - const basic_regex<_Cp, _Rp>&, - regex_constants::match_flag_type); + friend bool __detail:: +#if _GLIBCXX_INLINE_VERSION + __7:: // Required due to PR c++/59256 +#endif + __regex_algo_impl(_Bp, _Bp, match_results<_Bp, _Ap>&, + const basic_regex<_Cp, _Rp>&, + regex_constants::match_flag_type); void _M_resize(unsigned int __size) diff --git a/libstdc++-v3/include/bits/uniform_int_dist.h b/libstdc++-v3/include/bits/uniform_int_dist.h index 670e37953240..123d4aa8b95b 100644 --- a/libstdc++-v3/include/bits/uniform_int_dist.h +++ b/libstdc++-v3/include/bits/uniform_int_dist.h @@ -36,10 +36,10 @@ namespace std _GLIBCXX_VISIBILITY(default) { -_GLIBCXX_BEGIN_NAMESPACE_VERSION namespace __detail { +_GLIBCXX_BEGIN_NAMESPACE_VERSION /* Determine whether number is a power of 2. */ template inline bool @@ -47,8 +47,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { return ((__x - 1) & __x) == 0; }; +_GLIBCXX_END_NAMESPACE_VERSION } +_GLIBCXX_BEGIN_NAMESPACE_VERSION + /** * @brief Uniform discrete distribution for random numbers. * diff --git a/libstdc++-v3/include/experimental/algorithm b/libstdc++-v3/include/experimental/algorithm index 4281b42e292b..ce0a1491434c 100644 --- a/libstdc++-v3/include/experimental/algorithm +++ b/libstdc++-v3/include/experimental/algorithm @@ -37,6 +37,7 @@ #include #include +#include namespace std _GLIBCXX_VISIBILITY(default) { diff --git a/libstdc++-v3/include/experimental/any b/libstdc++-v3/include/experimental/any index 487ba0167973..30cdf54c1925 100644 --- a/libstdc++-v3/include/experimental/any +++ b/libstdc++-v3/include/experimental/any @@ -39,6 +39,7 @@ #include #include #include +#include namespace std _GLIBCXX_VISIBILITY(default) { diff --git a/libstdc++-v3/include/experimental/chrono b/libstdc++-v3/include/experimental/chrono index 0631fa5b140e..d4ac0706d48e 100644 --- a/libstdc++-v3/include/experimental/chrono +++ b/libstdc++-v3/include/experimental/chrono @@ -40,7 +40,7 @@ #else #include - +#include namespace std _GLIBCXX_VISIBILITY(default) { diff --git a/libstdc++-v3/include/experimental/fs_fwd.h b/libstdc++-v3/include/experimental/fs_fwd.h index 9cf903fe9020..ade86c35b978 100644 --- a/libstdc++-v3/include/experimental/fs_fwd.h +++ b/libstdc++-v3/include/experimental/fs_fwd.h @@ -46,10 +46,13 @@ namespace filesystem { inline namespace v1 { +#if _GLIBCXX_INLINE_VERSION +inline namespace __7 { } +#endif _GLIBCXX_BEGIN_NAMESPACE_VERSION #if _GLIBCXX_USE_CXX11_ABI - inline namespace __cxx11 __attribute__((__abi_tag__ ("cxx11"))) { } +inline namespace __cxx11 __attribute__((__abi_tag__ ("cxx11"))) { } #endif /** diff --git a/libstdc++-v3/include/experimental/functional b/libstdc++-v3/include/experimental/functional index 40d3bd44d1eb..8d19ad3a79a4 100644 --- a/libstdc++-v3/include/experimental/functional +++ b/libstdc++-v3/include/experimental/functional @@ -42,6 +42,7 @@ #include #include #include +#include namespace std _GLIBCXX_VISIBILITY(default) { diff --git a/libstdc++-v3/include/experimental/lfts_config.h b/libstdc++-v3/include/experimental/lfts_config.h new file mode 100644 index 000000000000..e93c9b742af3 --- /dev/null +++ b/libstdc++-v3/include/experimental/lfts_config.h @@ -0,0 +1,57 @@ +// Namespace declarations for Library Fundamentals TS -*- C++ -*- + +// Copyright (C) 2016 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. + +// Under Section 7 of GPL version 3, you are granted additional +// permissions described in the GCC Runtime Library Exception, version +// 3.1, as published by the Free Software Foundation. + +// You should have received a copy of the GNU General Public License and +// a copy of the GCC Runtime Library Exception along with this program; +// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see +// . + +/** @file experimental/lfts_config.h + * This is an internal header file, included by other library headers. + * Do not attempt to use it directly. + */ + +#if __cplusplus <= 201103L +# include +#else +#include + +#if _GLIBCXX_INLINE_VERSION +namespace std _GLIBCXX_VISIBILITY(default) +{ +namespace chrono +{ +namespace experimental +{ +inline namespace fundamentals_v1 { inline namespace __7 { } } +inline namespace fundamentals_v2 { inline namespace __7 { } } +} // namespace experimental +} // namespace chrono + +namespace experimental +{ +inline namespace fundamentals_v1 { inline namespace __7 { } } +inline namespace fundamentals_v2 { inline namespace __7 { } } +inline namespace literals { inline namespace string_view_literals { + inline namespace __7 { } +} } // namespace literals::string_view_literals +} // namespace experimental +} // namespace std +#endif +#endif diff --git a/libstdc++-v3/include/experimental/optional b/libstdc++-v3/include/experimental/optional index f6e3fa0258ab..b85b4bff9238 100644 --- a/libstdc++-v3/include/experimental/optional +++ b/libstdc++-v3/include/experimental/optional @@ -53,6 +53,7 @@ #include #include #include +#include namespace std _GLIBCXX_VISIBILITY(default) { diff --git a/libstdc++-v3/include/experimental/ratio b/libstdc++-v3/include/experimental/ratio index a009dea6fe96..6e784a27b93b 100644 --- a/libstdc++-v3/include/experimental/ratio +++ b/libstdc++-v3/include/experimental/ratio @@ -40,7 +40,7 @@ #else #include - +#include namespace std _GLIBCXX_VISIBILITY(default) { @@ -49,6 +49,7 @@ namespace experimental inline namespace fundamentals_v1 { _GLIBCXX_BEGIN_NAMESPACE_VERSION + // See C++14 §20.11.5, ratio comparison template constexpr bool ratio_equal_v = ratio_equal<_R1, _R2>::value; diff --git a/libstdc++-v3/include/experimental/string_view b/libstdc++-v3/include/experimental/string_view index f11a1878c56a..5807345d44c5 100644 --- a/libstdc++-v3/include/experimental/string_view +++ b/libstdc++-v3/include/experimental/string_view @@ -41,6 +41,7 @@ #include #include +#include namespace std _GLIBCXX_VISIBILITY(default) { @@ -651,13 +652,12 @@ _GLIBCXX_END_NAMESPACE_VERSION namespace experimental { -_GLIBCXX_BEGIN_NAMESPACE_VERSION - // I added these EMSR. inline namespace literals { inline namespace string_view_literals { + _GLIBCXX_BEGIN_NAMESPACE_VERSION inline constexpr basic_string_view operator""sv(const char* __str, size_t __len) @@ -679,10 +679,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { return basic_string_view{__str, __len}; } #endif - } - } - -_GLIBCXX_END_NAMESPACE_VERSION + _GLIBCXX_END_NAMESPACE_VERSION + } // namespace string_literals + } // namespace literals } // namespace experimental } // namespace std diff --git a/libstdc++-v3/include/experimental/string_view.tcc b/libstdc++-v3/include/experimental/string_view.tcc index 942184206a65..7be3d53d92ed 100644 --- a/libstdc++-v3/include/experimental/string_view.tcc +++ b/libstdc++-v3/include/experimental/string_view.tcc @@ -44,6 +44,8 @@ namespace std _GLIBCXX_VISIBILITY(default) { namespace experimental { +inline namespace fundamentals_v1 +{ _GLIBCXX_BEGIN_NAMESPACE_VERSION template @@ -222,6 +224,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } _GLIBCXX_END_NAMESPACE_VERSION +} // namespace fundamentals_v1 } // namespace experimental } // namespace std diff --git a/libstdc++-v3/include/experimental/system_error b/libstdc++-v3/include/experimental/system_error index ba3f8befd83f..f034f9a94c24 100644 --- a/libstdc++-v3/include/experimental/system_error +++ b/libstdc++-v3/include/experimental/system_error @@ -40,7 +40,7 @@ #else #include - +#include namespace std _GLIBCXX_VISIBILITY(default) { @@ -49,12 +49,14 @@ namespace experimental inline namespace fundamentals_v1 { _GLIBCXX_BEGIN_NAMESPACE_VERSION + // See C++14 §19.5, System error support template constexpr bool is_error_code_enum_v = is_error_code_enum<_Tp>::value; template constexpr bool is_error_condition_enum_v = is_error_condition_enum<_Tp>::value; + _GLIBCXX_END_NAMESPACE_VERSION } // namespace fundamentals_v1 } // namespace experimental diff --git a/libstdc++-v3/include/experimental/tuple b/libstdc++-v3/include/experimental/tuple index 99935f1233a7..fb15d2cac531 100644 --- a/libstdc++-v3/include/experimental/tuple +++ b/libstdc++-v3/include/experimental/tuple @@ -36,6 +36,7 @@ #else #include +#include namespace std _GLIBCXX_VISIBILITY(default) { diff --git a/libstdc++-v3/include/experimental/type_traits b/libstdc++-v3/include/experimental/type_traits index db78eec9ec37..a4257e29a9c7 100644 --- a/libstdc++-v3/include/experimental/type_traits +++ b/libstdc++-v3/include/experimental/type_traits @@ -40,7 +40,7 @@ #else #include - +#include namespace std _GLIBCXX_VISIBILITY(default) { diff --git a/libstdc++-v3/include/std/chrono b/libstdc++-v3/include/std/chrono index 50a2bbfca9c1..abe0ca119e6c 100644 --- a/libstdc++-v3/include/std/chrono +++ b/libstdc++-v3/include/std/chrono @@ -788,6 +788,7 @@ _GLIBCXX_END_NAMESPACE_VERSION { inline namespace chrono_literals { + _GLIBCXX_BEGIN_NAMESPACE_VERSION template struct _Checked_integral_constant @@ -863,6 +864,7 @@ _GLIBCXX_END_NAMESPACE_VERSION operator""ns() { return __check_overflow(); } + _GLIBCXX_END_NAMESPACE_VERSION } // inline namespace chrono_literals } // inline namespace literals diff --git a/libstdc++-v3/include/std/complex b/libstdc++-v3/include/std/complex index 585683c6f93a..c06726c7c769 100644 --- a/libstdc++-v3/include/std/complex +++ b/libstdc++-v3/include/std/complex @@ -1929,10 +1929,13 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION conj(_Tp __x) { return __x; } +_GLIBCXX_END_NAMESPACE_VERSION + #if __cplusplus > 201103L inline namespace literals { inline namespace complex_literals { +_GLIBCXX_BEGIN_NAMESPACE_VERSION #define __cpp_lib_complex_udls 201309 @@ -1960,12 +1963,12 @@ inline namespace complex_literals { operator""il(unsigned long long __num) { return std::complex{0.0L, static_cast(__num)}; } +_GLIBCXX_END_NAMESPACE_VERSION } // inline namespace complex_literals } // inline namespace literals #endif // C++14 -_GLIBCXX_END_NAMESPACE_VERSION } // namespace #endif // C++11 diff --git a/libstdc++-v3/src/filesystem/Makefile.in b/libstdc++-v3/src/filesystem/Makefile.in index bbc45a873104..f8f0180f9ba6 100644 --- a/libstdc++-v3/src/filesystem/Makefile.in +++ b/libstdc++-v3/src/filesystem/Makefile.in @@ -352,7 +352,7 @@ WARN_CXXFLAGS = \ # -I/-D flags to pass when compiling. -AM_CPPFLAGS = $(GLIBCXX_INCLUDES) $(CPPFLAGS) +AM_CPPFLAGS = $(GLIBCXX_INCLUDES) toolexeclib_LTLIBRARIES = libstdc++fs.la headers = @ENABLE_DUAL_ABI_FALSE@cxx11_abi_sources = diff --git a/libstdc++-v3/testsuite/17_intro/using_namespace_std_exp_neg.cc b/libstdc++-v3/testsuite/17_intro/using_namespace_std_exp_neg.cc new file mode 100644 index 000000000000..963edda01364 --- /dev/null +++ b/libstdc++-v3/testsuite/17_intro/using_namespace_std_exp_neg.cc @@ -0,0 +1,66 @@ +// { dg-options "-std=gnu++11" } +// { dg-do compile } + +// Copyright (C) 2016 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 +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +namespace gnu +{ + using namespace std::experimental; // { dg-error "is not a namespace-name" } +} + +// { dg-error "expected namespace-name before" "" { target *-*-* } 63 } diff --git a/libstdc++-v3/testsuite/20_util/duration/literals/range.cc b/libstdc++-v3/testsuite/20_util/duration/literals/range.cc index a56b2389fe00..9cd3215067af 100644 --- a/libstdc++-v3/testsuite/20_util/duration/literals/range.cc +++ b/libstdc++-v3/testsuite/20_util/duration/literals/range.cc @@ -27,5 +27,5 @@ test01() // std::numeric_limits::max() == 9223372036854775807; auto h = 9223372036854775808h; - // { dg-error "cannot be represented" "" { target *-*-* } 796 } + // { dg-error "cannot be represented" "" { target *-*-* } 797 } } diff --git a/libstdc++-v3/testsuite/experimental/any/misc/any_cast_neg.cc b/libstdc++-v3/testsuite/experimental/any/misc/any_cast_neg.cc index f1992d954446..28388f68b0f3 100644 --- a/libstdc++-v3/testsuite/experimental/any/misc/any_cast_neg.cc +++ b/libstdc++-v3/testsuite/experimental/any/misc/any_cast_neg.cc @@ -26,5 +26,5 @@ void test01() using std::experimental::any_cast; const any y(1); - any_cast(y); // { dg-error "qualifiers" "" { target { *-*-* } } 310 } + any_cast(y); // { dg-error "qualifiers" "" { target { *-*-* } } 311 } } diff --git a/libstdc++-v3/testsuite/ext/profile/mutex_extensions_neg.cc b/libstdc++-v3/testsuite/ext/profile/mutex_extensions_neg.cc index dd19f1406b18..86065f73b754 100644 --- a/libstdc++-v3/testsuite/ext/profile/mutex_extensions_neg.cc +++ b/libstdc++-v3/testsuite/ext/profile/mutex_extensions_neg.cc @@ -25,4 +25,4 @@ #include -// { dg-error "multiple inlined namespaces" "" { target *-*-* } 322 } +// { dg-error "multiple inlined namespaces" "" { target *-*-* } 329 }