summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarshall Clow <mclow.lists@gmail.com>2017-05-11 14:00:54 +0000
committerMarshall Clow <mclow.lists@gmail.com>2017-05-11 14:00:54 +0000
commit7e154cdca71d694388e7773638243245b7450b81 (patch)
tree02fce663907fdb28eb69dcdd33ff3d473c9f60a2
parentafda4a9af9d3be64c528e8a25c2990f216d494c6 (diff)
downloadbcm5719-llvm-7e154cdca71d694388e7773638243245b7450b81.tar.gz
bcm5719-llvm-7e154cdca71d694388e7773638243245b7450b81.zip
Replace a nested namespace used for overload resolution with a struct. Richard Smith says that using the namespace results in an ODR violation, but I disagree. Nevertheless, the struct works just as well.
llvm-svn: 302800
-rw-r--r--libcxx/include/memory4
1 files changed, 2 insertions, 2 deletions
diff --git a/libcxx/include/memory b/libcxx/include/memory
index bb1b415311d..4201c92dd72 100644
--- a/libcxx/include/memory
+++ b/libcxx/include/memory
@@ -996,11 +996,11 @@ struct __rebind_pointer {
// allocator_traits
-namespace __has_pointer_type_imp
+struct __has_pointer_type_imp
{
template <class _Up> static __two __test(...);
template <class _Up> static char __test(typename _Up::pointer* = 0);
-}
+};
template <class _Tp>
struct __has_pointer_type
OpenPOWER on IntegriCloud