diff options
| author | Jonathan Wakely <jwakely.gcc@gmail.com> | 2012-04-01 17:10:57 +0000 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2012-04-01 18:10:57 +0100 |
| commit | 181c9de2a6d42430f66fe1374d84208703bd0ac3 (patch) | |
| tree | 7e8919cd917a86f90b5ca11c16d88451bfb00e1d | |
| parent | 1171b423c6ee24c1a02a7d22336570c377ae1e5b (diff) | |
| download | gcc-181c9de2a6d42430f66fe1374d84208703bd0ac3.zip gcc-181c9de2a6d42430f66fe1374d84208703bd0ac3.tar.gz gcc-181c9de2a6d42430f66fe1374d84208703bd0ac3.tar.bz2 | |
functional (__callable_functor): Overload for volatile-qualified pointers.
* include/std/functional (__callable_functor): Overload for
volatile-qualified pointers.
* testsuite/20_util/function/10.cc: New.
From-SVN: r186055
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/functional | 10 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/20_util/function/10.cc | 37 |
3 files changed, 53 insertions, 0 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 46923dc..6f4e7bf 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2012-04-01 Jonathan Wakely <jwakely.gcc@gmail.com> + + * include/std/functional (__callable_functor): Overload for + volatile-qualified pointers. + * testsuite/20_util/function/10.cc: New. + 2012-03-30 Jeffrey Yasskin <jyasskin@gcc.gnu.org> Paolo Carlini <paolo.carlini@oracle.com> diff --git a/libstdc++-v3/include/std/functional b/libstdc++-v3/include/std/functional index 14785dd..980c6ab 100644 --- a/libstdc++-v3/include/std/functional +++ b/libstdc++-v3/include/std/functional @@ -1716,6 +1716,16 @@ _GLIBCXX_HAS_NESTED_TYPE(result_type) __callable_functor(_Member _Class::* const &__p) { return std::mem_fn(__p); } + template<typename _Member, typename _Class> + inline _Mem_fn<_Member _Class::*> + __callable_functor(_Member _Class::* volatile &__p) + { return std::mem_fn(__p); } + + template<typename _Member, typename _Class> + inline _Mem_fn<_Member _Class::*> + __callable_functor(_Member _Class::* const volatile &__p) + { return std::mem_fn(__p); } + template<typename _Signature> class function; diff --git a/libstdc++-v3/testsuite/20_util/function/10.cc b/libstdc++-v3/testsuite/20_util/function/10.cc new file mode 100644 index 0000000..3776f39 --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/function/10.cc @@ -0,0 +1,37 @@ +// { dg-options "-std=gnu++0x" } +// { dg-do compile } +// +// Copyright (C) 2012 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.11 polymorphic function object wrapper + +#include <functional> + +struct X { void f() { } }; + +void (X::*p)() = &X::f; +void (X::* volatile& vp)() = p; + +typedef std::function<void(X&)> function_type; + +void test01() +{ + function_type f( vp ); + function_type f2( std::ref(vp) ); + function_type f3( std::cref(vp) ); +} |