diff options
| author | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-10-15 10:54:57 +0000 |
|---|---|---|
| committer | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-10-15 10:54:57 +0000 |
| commit | c2f8c8b74b069571d8b616db7d5c7e708e39fbf8 (patch) | |
| tree | 73e97e39264f0d50f4b69d5007c1a70b6717fd2b /libstdc++-v3/src | |
| parent | 602877960b9d60b5329eba170d0d4c41f0b52615 (diff) | |
| download | ppe42-gcc-c2f8c8b74b069571d8b616db7d5c7e708e39fbf8.tar.gz ppe42-gcc-c2f8c8b74b069571d8b616db7d5c7e708e39fbf8.zip | |
2004-10-15 Paolo Carlini <pcarlini@suse.de>
* include/ext/bitmap_allocator.h: Qualify ::operator delete.
* src/bitmap_allocator.cc: Likewise.
* src/mt_allocator.cc: Use ::operator delete, not delete,
consistently with ::operator new.
* include/ext/bitmap_allocator.h (deallocate): Check for null
pointer.
* testsuite/ext/bitmap_allocator/check_deallocate_null.cc: New.
* testsuite/testsuite_allocator.h (check_deallocate_null): Add test.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@89089 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/src')
| -rw-r--r-- | libstdc++-v3/src/bitmap_allocator.cc | 2 | ||||
| -rw-r--r-- | libstdc++-v3/src/mt_allocator.cc | 20 |
2 files changed, 11 insertions, 11 deletions
diff --git a/libstdc++-v3/src/bitmap_allocator.cc b/libstdc++-v3/src/bitmap_allocator.cc index f37c5dca28b..3cd0fb90e3f 100644 --- a/libstdc++-v3/src/bitmap_allocator.cc +++ b/libstdc++-v3/src/bitmap_allocator.cc @@ -121,7 +121,7 @@ namespace __gnu_cxx iterator __iter = _S_free_list.begin(); while (__iter != _S_free_list.end()) { - operator delete((void*)*__iter); + ::operator delete((void*)*__iter); ++__iter; } _S_free_list.clear(); diff --git a/libstdc++-v3/src/mt_allocator.cc b/libstdc++-v3/src/mt_allocator.cc index 7dff273ba12..08f5c87c0dd 100644 --- a/libstdc++-v3/src/mt_allocator.cc +++ b/libstdc++-v3/src/mt_allocator.cc @@ -61,10 +61,10 @@ namespace __gnu_cxx delete __bin._M_address; __bin._M_address = __tmp; } - delete __bin._M_first; + ::operator delete(__bin._M_first); } - delete _M_bin; - delete _M_binmap; + ::operator delete(_M_bin); + ::operator delete(_M_binmap); } } @@ -190,10 +190,10 @@ namespace __gnu_cxx delete __bin._M_address; __bin._M_address = __tmp; } - delete __bin._M_first; - delete __bin._M_free; - delete __bin._M_used; - delete __bin._M_mutex; + ::operator delete(__bin._M_first); + ::operator delete(__bin._M_free); + ::operator delete(__bin._M_used); + ::operator delete(__bin._M_mutex); } ::operator delete(_M_thread_freelist_initial); } @@ -209,11 +209,11 @@ namespace __gnu_cxx delete __bin._M_address; __bin._M_address = __tmp; } - delete __bin._M_first; + ::operator delete(__bin._M_first); } } - delete _M_bin; - delete _M_binmap; + ::operator delete(_M_bin); + ::operator delete(_M_binmap); } } |
