diff options
| author | Howard Hinnant <hhinnant@apple.com> | 2011-02-02 17:36:20 +0000 |
|---|---|---|
| committer | Howard Hinnant <hhinnant@apple.com> | 2011-02-02 17:36:20 +0000 |
| commit | 72c5e14203eb73f5368821f1caa5912c2dd90d91 (patch) | |
| tree | 1eed07b14d54394f816997b9b49d119acf20c4af /libcxx/include/map | |
| parent | 09a6b46c8947cba7c01ccf370d82cea712ae37c3 (diff) | |
| download | bcm5719-llvm-72c5e14203eb73f5368821f1caa5912c2dd90d91.tar.gz bcm5719-llvm-72c5e14203eb73f5368821f1caa5912c2dd90d91.zip | |
Qualify calls to addressof with std::. Bug 9106
llvm-svn: 124726
Diffstat (limited to 'libcxx/include/map')
| -rw-r--r-- | libcxx/include/map | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/libcxx/include/map b/libcxx/include/map index 387c6b501b5..6b7bff6ceb1 100644 --- a/libcxx/include/map +++ b/libcxx/include/map @@ -475,9 +475,9 @@ public: void operator()(pointer __p) { if (__second_constructed) - __alloc_traits::destroy(__na_, addressof(__p->__value_.second)); + __alloc_traits::destroy(__na_, _STD::addressof(__p->__value_.second)); if (__first_constructed) - __alloc_traits::destroy(__na_, addressof(__p->__value_.first)); + __alloc_traits::destroy(__na_, _STD::addressof(__p->__value_.first)); if (__p) __alloc_traits::deallocate(__na_, __p, 1); } @@ -1131,9 +1131,9 @@ map<_Key, _Tp, _Compare, _Allocator>::__construct_node() { __node_allocator& __na = __tree_.__node_alloc(); __node_holder __h(__node_traits::allocate(__na, 1), _D(__na)); - __node_traits::construct(__na, addressof(__h->__value_.first)); + __node_traits::construct(__na, _STD::addressof(__h->__value_.first)); __h.get_deleter().__first_constructed = true; - __node_traits::construct(__na, addressof(__h->__value_.second)); + __node_traits::construct(__na, _STD::addressof(__h->__value_.second)); __h.get_deleter().__second_constructed = true; return __h; } @@ -1146,7 +1146,7 @@ map<_Key, _Tp, _Compare, _Allocator>::__construct_node(_A0&& __a0) { __node_allocator& __na = __tree_.__node_alloc(); __node_holder __h(__node_traits::allocate(__na, 1), _D(__na)); - __node_traits::construct(__na, addressof(__h->__value_), _STD::forward<_A0>(__a0)); + __node_traits::construct(__na, _STD::addressof(__h->__value_), _STD::forward<_A0>(__a0)); __h.get_deleter().__first_constructed = true; __h.get_deleter().__second_constructed = true; return __h; @@ -1162,9 +1162,9 @@ map<_Key, _Tp, _Compare, _Allocator>::__construct_node(_A0&& __a0, _Args&& ...__ { __node_allocator& __na = __tree_.__node_alloc(); __node_holder __h(__node_traits::allocate(__na, 1), _D(__na)); - __node_traits::construct(__na, addressof(__h->__value_.first), _STD::forward<_A0>(__a0)); + __node_traits::construct(__na, _STD::addressof(__h->__value_.first), _STD::forward<_A0>(__a0)); __h.get_deleter().__first_constructed = true; - __node_traits::construct(__na, addressof(__h->__value_.second), _STD::forward<_Args>(__args)...); + __node_traits::construct(__na, _STD::addressof(__h->__value_.second), _STD::forward<_Args>(__args)...); __h.get_deleter().__second_constructed = true; return __h; } @@ -1179,9 +1179,9 @@ map<_Key, _Tp, _Compare, _Allocator>::__construct_node(const key_type& __k) { __node_allocator& __na = __tree_.__node_alloc(); __node_holder __h(__node_traits::allocate(__na, 1), _D(__na)); - __node_traits::construct(__na, addressof(__h->__value_.first), __k); + __node_traits::construct(__na, _STD::addressof(__h->__value_.first), __k); __h.get_deleter().__first_constructed = true; - __node_traits::construct(__na, addressof(__h->__value_.second)); + __node_traits::construct(__na, _STD::addressof(__h->__value_.second)); __h.get_deleter().__second_constructed = true; return _STD::move(__h); } @@ -1685,9 +1685,9 @@ multimap<_Key, _Tp, _Compare, _Allocator>::__construct_node() { __node_allocator& __na = __tree_.__node_alloc(); __node_holder __h(__node_traits::allocate(__na, 1), _D(__na)); - __node_traits::construct(__na, addressof(__h->__value_.first)); + __node_traits::construct(__na, _STD::addressof(__h->__value_.first)); __h.get_deleter().__first_constructed = true; - __node_traits::construct(__na, addressof(__h->__value_.second)); + __node_traits::construct(__na, _STD::addressof(__h->__value_.second)); __h.get_deleter().__second_constructed = true; return __h; } @@ -1701,7 +1701,7 @@ multimap<_Key, _Tp, _Compare, _Allocator>::__construct_node(_A0&& __a0) { __node_allocator& __na = __tree_.__node_alloc(); __node_holder __h(__node_traits::allocate(__na, 1), _D(__na)); - __node_traits::construct(__na, addressof(__h->__value_), _STD::forward<_A0>(__a0)); + __node_traits::construct(__na, _STD::addressof(__h->__value_), _STD::forward<_A0>(__a0)); __h.get_deleter().__first_constructed = true; __h.get_deleter().__second_constructed = true; return __h; @@ -1718,9 +1718,9 @@ multimap<_Key, _Tp, _Compare, _Allocator>::__construct_node(_A0&& __a0, _Args&& { __node_allocator& __na = __tree_.__node_alloc(); __node_holder __h(__node_traits::allocate(__na, 1), _D(__na)); - __node_traits::construct(__na, addressof(__h->__value_.first), _STD::forward<_A0>(__a0)); + __node_traits::construct(__na, _STD::addressof(__h->__value_.first), _STD::forward<_A0>(__a0)); __h.get_deleter().__first_constructed = true; - __node_traits::construct(__na, addressof(__h->__value_.second), _STD::forward<_Args>(__args)...); + __node_traits::construct(__na, _STD::addressof(__h->__value_.second), _STD::forward<_Args>(__args)...); __h.get_deleter().__second_constructed = true; return __h; } |
