diff options
| author | Martin Liska <mliska@suse.cz> | 2022-10-28 10:02:34 +0200 |
|---|---|---|
| committer | Martin Liska <mliska@suse.cz> | 2022-10-28 10:02:34 +0200 |
| commit | 1eb021edb27e26f95cda63df121f6bc951647599 (patch) | |
| tree | 7f132fded85bd7d05d81cd4c1227da2fd0c3c2d5 /libstdc++-v3 | |
| parent | 62e475bad0d668c432bb97113cbf73fa281b8b55 (diff) | |
| parent | 0607307768b66a90e27c5bc91a247acc938f070e (diff) | |
| download | gcc-1eb021edb27e26f95cda63df121f6bc951647599.zip gcc-1eb021edb27e26f95cda63df121f6bc951647599.tar.gz gcc-1eb021edb27e26f95cda63df121f6bc951647599.tar.bz2 | |
Merge branch 'master' into devel/sphinx
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/locale_classes.tcc | 3 |
2 files changed, 9 insertions, 0 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index b668b93..b3b168d 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2022-10-26 Marek Polacek <polacek@redhat.com> + + PR c++/106393 + * include/bits/locale_classes.tcc: Add #pragma to disable + -Wdangling-reference with std::use_facet. + 2022-10-21 Arsen Arsenović <arsen@aarsen.me> * acinclude.m4: Default hosted to off if building without diff --git a/libstdc++-v3/include/bits/locale_classes.tcc b/libstdc++-v3/include/bits/locale_classes.tcc index 64cd753..9cc4f23 100644 --- a/libstdc++-v3/include/bits/locale_classes.tcc +++ b/libstdc++-v3/include/bits/locale_classes.tcc @@ -127,6 +127,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION * @return Reference to facet of type Facet. * @throw std::bad_cast if @p __loc doesn't contain a facet of type _Facet. */ +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdangling-reference" template<typename _Facet> const _Facet& use_facet(const locale& __loc) @@ -141,6 +143,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION return static_cast<const _Facet&>(*__facets[__i]); #endif } +#pragma GCC diagnostic pop // Generic version does nothing. |