diff options
| author | Jonathan Wakely <jwakely.gcc@gmail.com> | 2013-05-21 08:15:13 +0000 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2013-05-21 09:15:13 +0100 |
| commit | bf5f6aa9be32bec652082a6b1e834b7340af8739 (patch) | |
| tree | 611ed8eba86e4bfcd666167e39fef2dcb74c89e6 | |
| parent | 7ec67e2af8d310e18dd894c9836c28254773bd0c (diff) | |
| download | gcc-bf5f6aa9be32bec652082a6b1e834b7340af8739.zip gcc-bf5f6aa9be32bec652082a6b1e834b7340af8739.tar.gz gcc-bf5f6aa9be32bec652082a6b1e834b7340af8739.tar.bz2 | |
re PR libstdc++/57336 (Cannot INVOKE a reference_wrapper around an abstract type)
PR libstdc++/57336
* include/std/functional (__invoke): Do not form function types with
abstract return type.
* testsuite/20_util/reference_wrapper/invoke-3.cc: New.
From-SVN: r199136
| -rw-r--r-- | libstdc++-v3/ChangeLog | 7 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/functional | 2 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/20_util/reference_wrapper/invoke-3.cc | 37 |
3 files changed, 45 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 3c1e7a9..d46fbcf 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2013-05-21 Jonathan Wakely <jwakely.gcc@gmail.com> + + PR libstdc++/57336 + * include/std/functional (__invoke): Do not form function types with + abstract return type. + * testsuite/20_util/reference_wrapper/invoke-3.cc: New. + 2013-05-19 Jonathan Wakely <jwakely.gcc@gmail.com> * include/std/tuple (get): Implement N3670. diff --git a/libstdc++-v3/include/std/functional b/libstdc++-v3/include/std/functional index 44d3fd5..63ba777 100644 --- a/libstdc++-v3/include/std/functional +++ b/libstdc++-v3/include/std/functional @@ -195,7 +195,7 @@ _GLIBCXX_HAS_NESTED_TYPE(result_type) (!is_member_pointer<_Functor>::value && !is_function<_Functor>::value && !is_function<typename remove_pointer<_Functor>::type>::value), - typename result_of<_Functor(_Args&&...)>::type + typename result_of<_Functor&(_Args&&...)>::type >::type __invoke(_Functor& __f, _Args&&... __args) { diff --git a/libstdc++-v3/testsuite/20_util/reference_wrapper/invoke-3.cc b/libstdc++-v3/testsuite/20_util/reference_wrapper/invoke-3.cc new file mode 100644 index 0000000..4291a67 --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/reference_wrapper/invoke-3.cc @@ -0,0 +1,37 @@ +// { dg-options "-std=gnu++11" } +// { dg-do compile } + +// Copyright (C) 2013 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/>. + +// 20.8.3.4 reference_wrapper invocation [refwrap.invoke] +#include <functional> + +struct ABC +{ + virtual bool operator()() const = 0; +}; + +struct Concrete : ABC +{ + virtual bool operator()() const { return true; } +}; + +Concrete c; +ABC& abc = c; + +auto b = std::cref(abc)(); |