diff options
| author | Howard Hinnant <hhinnant@apple.com> | 2012-10-30 19:06:59 +0000 |
|---|---|---|
| committer | Howard Hinnant <hhinnant@apple.com> | 2012-10-30 19:06:59 +0000 |
| commit | 54d333a601a84e10710463e845f9f3a0cb6ca72b (patch) | |
| tree | 23a7b23123e2088218754a31f9f60912626635c9 /libcxx/include/__functional_base | |
| parent | eac2887143bc33febe1cbbe308b2cef749e28284 (diff) | |
| download | bcm5719-llvm-54d333a601a84e10710463e845f9f3a0cb6ca72b.tar.gz bcm5719-llvm-54d333a601a84e10710463e845f9f3a0cb6ca72b.zip | |
Rename uses of _ and __ because these are getting stepped on by macros from other system code.
llvm-svn: 167038
Diffstat (limited to 'libcxx/include/__functional_base')
| -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 63aa41d5255..2385459c38c 100644 --- a/libcxx/include/__functional_base +++ b/libcxx/include/__functional_base @@ -43,7 +43,7 @@ template <class _Tp> struct __has_result_type { private: - struct __two {char _; char __;}; + struct __two {char __lx; char __lxx;}; template <class _Up> static __two __test(...); template <class _Up> static char __test(typename _Up::result_type* = 0); public: @@ -69,7 +69,7 @@ template <class _Tp> struct __derives_from_unary_function { private: - struct __two {char _; char __;}; + struct __two {char __lx; char __lxx;}; static __two __test(...); template <class _Ap, class _Rp> static unary_function<_Ap, _Rp> @@ -83,7 +83,7 @@ template <class _Tp> struct __derives_from_binary_function { private: - struct __two {char _; char __;}; + struct __two {char __lx; char __lxx;}; static __two __test(...); template <class _A1, class _A2, class _Rp> static binary_function<_A1, _A2, _Rp> |
