diff options
| author | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-01-08 21:01:14 +0000 |
|---|---|---|
| committer | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-01-08 21:01:14 +0000 |
| commit | e973c78ecb08920159babf9c14d5405bc9ec28fd (patch) | |
| tree | 33cae8c916152de48d116ff24d515a45580a560e /libstdc++-v3/include/std/functional | |
| parent | a240d038208d9de63e2b762f8d9add6130bbc73d (diff) | |
| download | ppe42-gcc-e973c78ecb08920159babf9c14d5405bc9ec28fd.tar.gz ppe42-gcc-e973c78ecb08920159babf9c14d5405bc9ec28fd.zip | |
PR libstdc++/55908
* include/std/functional (_Mem_fn::operator()): Fix constraints to
avoid ambiguity.
* testsuite/20_util/function_objects/mem_fn/55908.cc: New.
* testsuite/20_util/bind/ref_neg.cc: Adjust dg-error line numbers.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@195035 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/include/std/functional')
| -rw-r--r-- | libstdc++-v3/include/std/functional | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libstdc++-v3/include/std/functional b/libstdc++-v3/include/std/functional index 0b5d47507ca..714b3ed9ecf 100644 --- a/libstdc++-v3/include/std/functional +++ b/libstdc++-v3/include/std/functional @@ -648,7 +648,7 @@ _GLIBCXX_HAS_NESTED_TYPE(result_type) template<typename _Tp, typename... _Args> using _RequireValidArgs2 - = _Require<_NotSame<_Class, _Tp>, _NotSame<_Class*, _Tp>, + = _Require<_NotSame<_Class, _Tp>, _NotSame<const _Class*, _Tp>, _AllConvertible<_Pack<_Args...>, _Pack<_ArgTypes...>>>; template<typename _Tp, typename... _Args> @@ -727,7 +727,7 @@ _GLIBCXX_HAS_NESTED_TYPE(result_type) template<typename _Tp, typename... _Args> using _RequireValidArgs2 - = _Require<_NotSame<_Class, _Tp>, _NotSame<_Class*, _Tp>, + = _Require<_NotSame<_Class, _Tp>, _NotSame<volatile _Class*, _Tp>, _AllConvertible<_Pack<_Args...>, _Pack<_ArgTypes...>>>; template<typename _Tp, typename... _Args> @@ -807,7 +807,8 @@ _GLIBCXX_HAS_NESTED_TYPE(result_type) template<typename _Tp, typename... _Args> using _RequireValidArgs2 - = _Require<_NotSame<_Class, _Tp>, _NotSame<_Class*, _Tp>, + = _Require<_NotSame<_Class, _Tp>, + _NotSame<const volatile _Class*, _Tp>, _AllConvertible<_Pack<_Args...>, _Pack<_ArgTypes...>>>; template<typename _Tp, typename... _Args> |
