mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-01-10 01:34:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

re PR libstdc++/65760 (invalid use of incomplete type with std::is_convertible<C, C>)

Browse Source 
PR libstdc++/65760
	* include/std/functional (__check_func_return_type): Use is_same to
	avoid using _is_convertible on incomplete types.
	* testsuite/20_util/function/65760.cc: New.

From-SVN: r222581
This commit is contained in:
Jonathan Wakely 2015-04-29 17:07:47 +01:00 committed by Jonathan Wakely
parent b811915de1
commit 952bc7a64c
3 changed files with 44 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libstdc++-v3/ChangeLog
View File

@ -1,5 +1,10 @@
2015-04-29 Jonathan Wakely <jwakely@redhat.com>
PR libstdc++/65760
* include/std/functional (__check_func_return_type): Use is_same to
avoid using _is_convertible on incomplete types.
* testsuite/20_util/function/65760.cc: New.
PR libstdc++/64657
* include/bits/basic_string (basic_string::_S_copy_chars): Cast
expression to void.

2
libstdc++-v3/include/std/functional
View File

@ -1962,7 +1962,7 @@ _GLIBCXX_MEM_FN_TRAITS(&&, false_type, true_type)
template<typename _From, typename _To>
using __check_func_return_type
= __or_<is_void<_To>, is_convertible<_From, _To>>;
= __or_<is_void<_To>, is_same<_From, _To>, is_convertible<_From, _To>>;
/**
* @brief Primary class template for std::function.

38
libstdc++-v3/testsuite/20_util/function/65760.cc Normal file
View File

@ -0,0 +1,38 @@
// Copyright (C) 2015 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++11" }
// { dg-do compile }
// libstdc++/65760
// c.f. https://gcc.gnu.org/ml/libstdc++/2015-04/msg00116.html
#include <functional>
struct C {
C() = default;
C(std::function<C(int)>);
C(std::function<C(int, int)>);
C operator()(int);
C operator()(int, int);
};
int main() {
C c = C();
}