diff options
| author | Howard Hinnant <hhinnant@apple.com> | 2013-09-21 01:45:05 +0000 |
|---|---|---|
| committer | Howard Hinnant <hhinnant@apple.com> | 2013-09-21 01:45:05 +0000 |
| commit | b1c82cd09022f5e94f1d6c20a8d9182d7dd68abc (patch) | |
| tree | a289f2dd9da112b44d86526b82b19edeae85e6ee /libcxx | |
| parent | 78fb291e627b681f3c868c7e9cdba210d24d53d8 (diff) | |
| download | bcm5719-llvm-b1c82cd09022f5e94f1d6c20a8d9182d7dd68abc.tar.gz bcm5719-llvm-b1c82cd09022f5e94f1d6c20a8d9182d7dd68abc.zip | |
David Chisnall: macro protect 'test' in __has_pointer_type_imp.
llvm-svn: 191126
Diffstat (limited to 'libcxx')
| -rw-r--r-- | libcxx/include/memory | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libcxx/include/memory b/libcxx/include/memory index 3a98d1d5e27..bf44837fc2a 100644 --- a/libcxx/include/memory +++ b/libcxx/include/memory @@ -917,13 +917,13 @@ public: namespace __has_pointer_type_imp { - template <class _Up> static __two test(...); - template <class _Up> static char test(typename _Up::pointer* = 0); + template <class _Up> static __two __test(...); + template <class _Up> static char __test(typename _Up::pointer* = 0); } template <class _Tp> struct __has_pointer_type - : public integral_constant<bool, sizeof(__has_pointer_type_imp::test<_Tp>(0)) == 1> + : public integral_constant<bool, sizeof(__has_pointer_type_imp::__test<_Tp>(0)) == 1> { }; |
