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 | ce48a1137d56d368828d360e5f2a8162bac6517c (patch) | |
| tree | ec224d56b3d3a54fafbd14126993b38671f4ebec /libcxx/include/__functional_base_03 | |
| parent | 070f96c567f7b0b3a0aa03178d2b6f05cdb2e447 (diff) | |
| download | bcm5719-llvm-ce48a1137d56d368828d360e5f2a8162bac6517c.tar.gz bcm5719-llvm-ce48a1137d56d368828d360e5f2a8162bac6517c.zip | |
_STD -> _VSTD to avoid macro clash on windows
llvm-svn: 134190
Diffstat (limited to 'libcxx/include/__functional_base_03')
| -rw-r--r-- | libcxx/include/__functional_base_03 | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libcxx/include/__functional_base_03 b/libcxx/include/__functional_base_03 index 7fed6c753fb..fabda5bc3d4 100644 --- a/libcxx/include/__functional_base_03 +++ b/libcxx/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> |
