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

Make the perfect-forwarding constructor of a two-element tuple sfinae away when the first argument is an allocator_arg. 

Make the perfect-forwarding constructor of a two-element tuple
sfinae away when the first argument is an allocator_arg.
* include/std/tuple (tuple(_U1&&, _U2&&)): Constrain.
* testsuite/20_util/tuple/cons/allocator_with_any.cc: New.
* testsuite/20_util/tuple/element_access/get_neg.cc: Adjust.

From-SVN: r243795
This commit is contained in:
Ville Voutilainen 2016-12-19 14:55:33 +02:00 committed by Ville Voutilainen
parent 99eb50e806
commit 4b21c3ea03
4 changed files with 57 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,11 @@
2016-12-19 Ville Voutilainen <ville.voutilainen@gmail.com>
Make the perfect-forwarding constructor of a two-element tuple
sfinae away when the first argument is an allocator_arg.
* include/std/tuple (tuple(_U1&&, _U2&&)): Constrain.
* testsuite/20_util/tuple/cons/allocator_with_any.cc: New.
* testsuite/20_util/tuple/element_access/get_neg.cc: Adjust.
2016-12-16 Jonathan Wakely <jwakely@redhat.com>
* include/bits/stl_map.h (map::erase(iterator)): Add Doxygen markup

8
libstdc++-v3/include/std/tuple
View File

@ -951,7 +951,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
enable_if<_TMC::template
_MoveConstructibleTuple<_U1, _U2>()
&& _TMC::template
_ImplicitlyMoveConvertibleTuple<_U1, _U2>(),
_ImplicitlyMoveConvertibleTuple<_U1, _U2>()
&& !is_same<typename decay<_U1>::type,
allocator_arg_t>::value,
bool>::type = true>
constexpr tuple(_U1&& __a1, _U2&& __a2)
: _Inherited(std::forward<_U1>(__a1), std::forward<_U2>(__a2)) { }
@ -960,7 +962,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
enable_if<_TMC::template
_MoveConstructibleTuple<_U1, _U2>()
&& !_TMC::template
_ImplicitlyMoveConvertibleTuple<_U1, _U2>(),
_ImplicitlyMoveConvertibleTuple<_U1, _U2>()
&& !is_same<typename decay<_U1>::type,
allocator_arg_t>::value,
bool>::type = false>
explicit constexpr tuple(_U1&& __a1, _U2&& __a2)
: _Inherited(std::forward<_U1>(__a1), std::forward<_U2>(__a2)) { }

42
libstdc++-v3/testsuite/20_util/tuple/cons/allocator_with_any.cc Normal file
View File

@ -0,0 +1,42 @@
// { dg-do run { target c++14 } }
// 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
// <http://www.gnu.org/licenses/>.
// NOTE: This makes use of the fact that we know how moveable
// is implemented on tuple. If the implementation changed
// this test may begin to fail.
#include <tuple>
#include <experimental/any>
#include <testsuite_hooks.h>
using std::experimental::any;
void test01()
{
std::tuple<any, any> t(std::allocator_arg,
std::allocator<any>{});
VERIFY(std::get<0>(t).empty());
VERIFY(std::get<1>(t).empty());
}
int main()
{
test01();
}

2
libstdc++-v3/testsuite/20_util/tuple/element_access/get_neg.cc
View File

@ -17,7 +17,7 @@
// { dg-options "-fno-show-column" }
// { dg-do compile { target c++14 } }
// { dg-error "in range" "" { target *-*-* } 1280 }
// { dg-error "in range" "" { target *-*-* } 1284 }
#include <tuple>