diff options
| -rw-r--r-- | libstdc++-v3/ChangeLog | 8 | ||||
| -rw-r--r-- | 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 0d9e413..e018ecb 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,11 @@ +2008-09-18 Paolo Carlini <paolo.carlini@oracle.com> + + * 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 <paolo.carlini@oracle.com> PR libstdc++/37547 diff --git a/libstdc++-v3/include/bits/shared_ptr.h b/libstdc++-v3/include/bits/shared_ptr.h index 964797b..2d7cf24 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<void*>(_M_pi)) _Sp_cd_type(__p, __d); + ::new(static_cast<void*>(_M_pi)) _Sp_cd_type(__p, __d); } catch(...) { @@ -269,7 +269,7 @@ namespace std try { _M_pi = __a2.allocate(1); - new(static_cast<void*>(_M_pi)) _Sp_cd_type(__p, __d, __a); + ::new(static_cast<void*>(_M_pi)) _Sp_cd_type(__p, __d, __a); } catch(...) { @@ -290,8 +290,8 @@ namespace std try { _M_pi = __a2.allocate(1); - new(static_cast<void*>(_M_pi)) _Sp_cp_type(__a, - std::forward<_Args>(__args)...); + ::new(static_cast<void*>(_M_pi)) _Sp_cp_type(__a, + std::forward<_Args>(__args)...); } catch(...) { |