OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

PR libstdc++/83226 avoid forming pointer-to-reference type 

Backport from mainline
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.

From-SVN: r255324
This commit is contained in:
Jonathan Wakely 2017-12-01 17:12:04 +00:00 committed by Jonathan Wakely
parent 54482a130a
commit c4e8c8d71c
3 changed files with 41 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libstdc++-v3/ChangeLog
View File

@ -1,5 +1,13 @@
2017-12-01 Jonathan Wakely <jwakely@redhat.com>
Backport from mainline
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.
Backport from mainline
2017-11-14 Jonathan Wakely <jwakely@redhat.com>

4
libstdc++-v3/include/bits/node_handle.h
View File

@ -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;

30
libstdc++-v3/testsuite/23_containers/map/modifiers/insert/83226.cc Normal file
View File

@ -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++1z } }
#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
}