diff options
| author | Howard Hinnant <hhinnant@apple.com> | 2010-09-11 15:09:37 +0000 |
|---|---|---|
| committer | Howard Hinnant <hhinnant@apple.com> | 2010-09-11 15:09:37 +0000 |
| commit | 42daac442b769c6f9c1b80f77771e5f919f52038 (patch) | |
| tree | 51071404f2f3bbd759f48f240b3c12ac0fd9807f /libcxx/include | |
| parent | 82b3333b720442a9031441bd373158645e1913b5 (diff) | |
| download | bcm5719-llvm-42daac442b769c6f9c1b80f77771e5f919f52038.tar.gz bcm5719-llvm-42daac442b769c6f9c1b80f77771e5f919f52038.zip | |
Fix const bug in function
llvm-svn: 113684
Diffstat (limited to 'libcxx/include')
| -rw-r--r-- | libcxx/include/__functional_base | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libcxx/include/__functional_base b/libcxx/include/__functional_base index 769979ef3fe..6c7403219bd 100644 --- a/libcxx/include/__functional_base +++ b/libcxx/include/__functional_base @@ -306,7 +306,7 @@ typename enable_if >::type __invoke(_R (_T::*__f)(_Param...) const, _T1&& __t1, _Arg&& ...__arg) { - return (_STD::forward<_T>(__t1).*__f)(_STD::forward<_Arg>(__arg)...); + return (_STD::forward<const _T>(__t1).*__f)(_STD::forward<_Arg>(__arg)...); } template <class _R, class _T, class _T1, class ..._Param, class ..._Arg> @@ -319,7 +319,7 @@ typename enable_if >::type __invoke(_R (_T::*__f)(_Param...) volatile, _T1&& __t1, _Arg&& ...__arg) { - return (_STD::forward<_T>(__t1).*__f)(_STD::forward<_Arg>(__arg)...); + return (_STD::forward<volatile _T>(__t1).*__f)(_STD::forward<_Arg>(__arg)...); } template <class _R, class _T, class _T1, class ..._Param, class ..._Arg> @@ -332,7 +332,7 @@ typename enable_if >::type __invoke(_R (_T::*__f)(_Param...) const volatile, _T1&& __t1, _Arg&& ...__arg) { - return (_STD::forward<_T>(__t1).*__f)(_STD::forward<_Arg>(__arg)...); + return (_STD::forward<const volatile _T>(__t1).*__f)(_STD::forward<_Arg>(__arg)...); } // second bullet |
