diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2017-11-30 13:45:37 +0000 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2017-11-30 13:45:37 +0000 |
| commit | 5f939178ec1e667d2a05bed96a9078cc926eba9d (patch) | |
| tree | 49d8aaaed8eaf49cc108770ff49ccf45aa5b6ee8 /libstdc++-v3 | |
| parent | b0da403432622fbca987e23547af5b882c9ae87f (diff) | |
| download | gcc-5f939178ec1e667d2a05bed96a9078cc926eba9d.zip gcc-5f939178ec1e667d2a05bed96a9078cc926eba9d.tar.gz gcc-5f939178ec1e667d2a05bed96a9078cc926eba9d.tar.bz2 | |
PR libstdc++/83226 avoid forming pointer-to-reference type
PR libstdc++/83226
* include/bits/node_handle.h (_Node_handle::__pointer): Avoid forming
pointer-to-reference types.
* testsuite/23_containers/map/modifiers/insert/83226.cc: New test.
From-SVN: r255271
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 7 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/node_handle.h | 4 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/23_containers/map/modifiers/insert/83226.cc | 30 |
3 files changed, 40 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 55f1947..a79a284 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2017-11-30 Jonathan Wakely <jwakely@redhat.com> + + PR libstdc++/83226 + * include/bits/node_handle.h (_Node_handle::__pointer): Avoid forming + pointer-to-reference types. + * testsuite/23_containers/map/modifiers/insert/83226.cc: New test. + 2017-11-29 John David Anglin <danglin@gcc.gnu.org> * config/abi/post/hppa-linux-gnu/baseline_symbols.txt: Update. diff --git a/libstdc++-v3/include/bits/node_handle.h b/libstdc++-v3/include/bits/node_handle.h index 0d8dbeb..7f109ad 100644 --- a/libstdc++-v3/include/bits/node_handle.h +++ b/libstdc++-v3/include/bits/node_handle.h @@ -199,7 +199,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } template<typename _Tp> - using __pointer = __ptr_rebind<typename _AllocTraits::pointer, _Tp>; + using __pointer + = __ptr_rebind<typename _AllocTraits::pointer, + remove_reference_t<_Tp>>; __pointer<_Key> _M_pkey = nullptr; __pointer<typename _Value::second_type> _M_pmapped = nullptr; diff --git a/libstdc++-v3/testsuite/23_containers/map/modifiers/insert/83226.cc b/libstdc++-v3/testsuite/23_containers/map/modifiers/insert/83226.cc new file mode 100644 index 0000000..07afa5c --- /dev/null +++ b/libstdc++-v3/testsuite/23_containers/map/modifiers/insert/83226.cc @@ -0,0 +1,30 @@ +// Copyright (C) 2017 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 +// <http://www.gnu.org/licenses/>. + +// { dg-options "-std=gnu++17" } +// { dg-do compile { target c++17 } } + +#include <map> + +void +test01() +{ + int i = 0; + std::map<int, int&> m; + std::pair<const int, int&> p{1, i}; + m.insert(p); // PR libstdc++/83226 +} |