diff options
| author | Howard Hinnant <hhinnant@apple.com> | 2011-06-30 21:18:19 +0000 |
|---|---|---|
| committer | Howard Hinnant <hhinnant@apple.com> | 2011-06-30 21:18:19 +0000 |
| commit | 0949eedbd621bc1611266fb180d9a356ee1eaf9f (patch) | |
| tree | 32980a76874f97a8dfca6329b5b3eb9213a3be60 /include/__functional_base_03 | |
| parent | d318d49e5c74179d0f4f9a79ab0f54a9531c5513 (diff) | |
| download | external_libcxx-0949eedbd621bc1611266fb180d9a356ee1eaf9f.tar.gz external_libcxx-0949eedbd621bc1611266fb180d9a356ee1eaf9f.tar.bz2 external_libcxx-0949eedbd621bc1611266fb180d9a356ee1eaf9f.zip | |
_STD -> _VSTD to avoid macro clash on windows
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@134190 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include/__functional_base_03')
| -rw-r--r-- | include/__functional_base_03 | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/include/__functional_base_03 b/include/__functional_base_03 index 7fed6c753..fabda5bc3 100644 --- a/include/__functional_base_03 +++ b/include/__functional_base_03 @@ -842,7 +842,7 @@ struct __4th_helper template <class _T1, class _R> struct __4th_helper<_T1, _R, true> { - typedef typename __apply_cv<decltype(*_STD::declval<_T1>()), _R>::type type; + typedef typename __apply_cv<decltype(*_VSTD::declval<_T1>()), _R>::type type; }; template <class _R, class _T, class _T1> @@ -959,13 +959,13 @@ struct __invoke_return template <class _F> struct __invoke_return<_F, false> { - typedef decltype(__invoke(_STD::declval<_F>())) type; + typedef decltype(__invoke(_VSTD::declval<_F>())) type; }; template <class _Tp, class _A0> struct __invoke_return0 { - typedef decltype(__invoke(_STD::declval<_Tp>(), _STD::declval<_A0>())) type; + typedef decltype(__invoke(_VSTD::declval<_Tp>(), _VSTD::declval<_A0>())) type; }; template <class _R, class _T, class _A0> @@ -983,16 +983,16 @@ struct __invoke_return0<_R _T::*, _A0*> template <class _Tp, class _A0, class _A1> struct __invoke_return1 { - typedef decltype(__invoke(_STD::declval<_Tp>(), _STD::declval<_A0>(), - _STD::declval<_A1>())) type; + typedef decltype(__invoke(_VSTD::declval<_Tp>(), _VSTD::declval<_A0>(), + _VSTD::declval<_A1>())) type; }; template <class _Tp, class _A0, class _A1, class _A2> struct __invoke_return2 { - typedef decltype(__invoke(_STD::declval<_Tp>(), _STD::declval<_A0>(), - _STD::declval<_A1>(), - _STD::declval<_A2>())) type; + typedef decltype(__invoke(_VSTD::declval<_Tp>(), _VSTD::declval<_A0>(), + _VSTD::declval<_A1>(), + _VSTD::declval<_A2>())) type; }; template <class _Tp> |