From c78a2119d8c5728a09df47c7f30a7a190b6864da Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Thu, 18 Sep 2008 18:55:55 +0000 Subject: [PATCH] shared_ptr.h (__shared_count<>:: __shared_count(_Ptr, _Deleter), [...]): Qualify new with ::. 2008-09-18 Paolo Carlini * include/bits/shared_ptr.h (__shared_count<>:: __shared_count(_Ptr, _Deleter), __shared_count<>:: __shared_count(_Ptr, _Deleter, _Alloc), __shared_count<>:: __shared_count(_Sp_make_shared_tag, _Tp*, _Alloc, _Args&&...)): Qualify new with ::. From-SVN: r140469 --- libstdc++-v3/ChangeLog | 8 ++++++++ libstdc++-v3/include/bits/shared_ptr.h | 8 ++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 0d9e413faa3a..e018ecbd0dcf 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,11 @@ +2008-09-18 Paolo Carlini + + * include/bits/shared_ptr.h (__shared_count<>:: + __shared_count(_Ptr, _Deleter), __shared_count<>:: + __shared_count(_Ptr, _Deleter, _Alloc), __shared_count<>:: + __shared_count(_Sp_make_shared_tag, _Tp*, _Alloc, _Args&&...)): + Qualify new with ::. + 2008-09-17 Paolo Carlini PR libstdc++/37547 diff --git a/libstdc++-v3/include/bits/shared_ptr.h b/libstdc++-v3/include/bits/shared_ptr.h index 964797b140a4..2d7cf24c043e 100644 --- a/libstdc++-v3/include/bits/shared_ptr.h +++ b/libstdc++-v3/include/bits/shared_ptr.h @@ -249,7 +249,7 @@ namespace std try { _M_pi = __a2.allocate(1); - new(static_cast(_M_pi)) _Sp_cd_type(__p, __d); + ::new(static_cast(_M_pi)) _Sp_cd_type(__p, __d); } catch(...) { @@ -269,7 +269,7 @@ namespace std try { _M_pi = __a2.allocate(1); - new(static_cast(_M_pi)) _Sp_cd_type(__p, __d, __a); + ::new(static_cast(_M_pi)) _Sp_cd_type(__p, __d, __a); } catch(...) { @@ -290,8 +290,8 @@ namespace std try { _M_pi = __a2.allocate(1); - new(static_cast(_M_pi)) _Sp_cp_type(__a, - std::forward<_Args>(__args)...); + ::new(static_cast(_M_pi)) _Sp_cp_type(__a, + std::forward<_Args>(__args)...); } catch(...) { -- 2.47.2