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 | |
| 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')
| -rw-r--r-- | libcxx/include/__functional_base | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/libcxx/include/__functional_base b/libcxx/include/__functional_base index f2aa5041b87..441ab4f5d0b 100644 --- a/libcxx/include/__functional_base +++ b/libcxx/include/__functional_base @@ -287,18 +287,18 @@ template <class _F, class _A0, class ..._Args> inline _LIBCPP_INLINE_VISIBILITY auto __invoke(_F&& __f, _A0&& __a0, _Args&& ...__args) - -> decltype((_STD::forward<_A0>(__a0).*__f)(_STD::forward<_Args>(__args)...)) + -> decltype((_VSTD::forward<_A0>(__a0).*__f)(_VSTD::forward<_Args>(__args)...)) { - return (_STD::forward<_A0>(__a0).*__f)(_STD::forward<_Args>(__args)...); + return (_VSTD::forward<_A0>(__a0).*__f)(_VSTD::forward<_Args>(__args)...); } template <class _F, class _A0, class ..._Args> inline _LIBCPP_INLINE_VISIBILITY auto __invoke(_F&& __f, _A0&& __a0, _Args&& ...__args) - -> decltype(((*_STD::forward<_A0>(__a0)).*__f)(_STD::forward<_Args>(__args)...)) + -> decltype(((*_VSTD::forward<_A0>(__a0)).*__f)(_VSTD::forward<_Args>(__args)...)) { - return ((*_STD::forward<_A0>(__a0)).*__f)(_STD::forward<_Args>(__args)...); + return ((*_VSTD::forward<_A0>(__a0)).*__f)(_VSTD::forward<_Args>(__args)...); } // bullets 3 and 4 @@ -307,18 +307,18 @@ template <class _F, class _A0> inline _LIBCPP_INLINE_VISIBILITY auto __invoke(_F&& __f, _A0&& __a0) - -> decltype(_STD::forward<_A0>(__a0).*__f) + -> decltype(_VSTD::forward<_A0>(__a0).*__f) { - return _STD::forward<_A0>(__a0).*__f; + return _VSTD::forward<_A0>(__a0).*__f; } template <class _F, class _A0> inline _LIBCPP_INLINE_VISIBILITY auto __invoke(_F&& __f, _A0&& __a0) - -> decltype((*_STD::forward<_A0>(__a0)).*__f) + -> decltype((*_VSTD::forward<_A0>(__a0)).*__f) { - return (*_STD::forward<_A0>(__a0)).*__f; + return (*_VSTD::forward<_A0>(__a0)).*__f; } // bullet 5 @@ -327,15 +327,15 @@ template <class _F, class ..._Args> inline _LIBCPP_INLINE_VISIBILITY auto __invoke(_F&& __f, _Args&& ...__args) - -> decltype(_STD::forward<_F>(__f)(_STD::forward<_Args>(__args)...)) + -> decltype(_VSTD::forward<_F>(__f)(_VSTD::forward<_Args>(__args)...)) { - return _STD::forward<_F>(__f)(_STD::forward<_Args>(__args)...); + return _VSTD::forward<_F>(__f)(_VSTD::forward<_Args>(__args)...); } template <class _Tp, class ..._Args> struct __invoke_return { - typedef decltype(__invoke(_STD::declval<_Tp>(), _STD::declval<_Args>()...)) type; + typedef decltype(__invoke(_VSTD::declval<_Tp>(), _VSTD::declval<_Args>()...)) type; }; template <class _Tp> @@ -365,7 +365,7 @@ public: typename __invoke_of<type&, _ArgTypes...>::type operator() (_ArgTypes&&... __args) const { - return __invoke(get(), _STD::forward<_ArgTypes>(__args)...); + return __invoke(get(), _VSTD::forward<_ArgTypes>(__args)...); } }; |
