diff options
| author | brendan <brendan@138bc75d-0d04-0410-961f-82ee72b054a4> | 1998-01-05 18:35:07 +0000 |
|---|---|---|
| committer | brendan <brendan@138bc75d-0d04-0410-961f-82ee72b054a4> | 1998-01-05 18:35:07 +0000 |
| commit | 1096f4afd6691a947daefad4c24e5da4eea701ae (patch) | |
| tree | 1ba061222a2c9bd69668f3e4c84edfaac2e97d9d /libstdc++ | |
| parent | 3ad3a0ed3b930971ede746d203c141f93f29f7fd (diff) | |
| download | ppe42-gcc-1096f4afd6691a947daefad4c24e5da4eea701ae.tar.gz ppe42-gcc-1096f4afd6691a947daefad4c24e5da4eea701ae.zip | |
* std/bastring.cc (basic_string::Rep::operator delete): Don't claim
to return from deallocate, since this is a void method.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@17297 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++')
| -rw-r--r-- | libstdc++/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++/std/bastring.cc | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/libstdc++/ChangeLog b/libstdc++/ChangeLog index b53b779efea..ffe617ae45c 100644 --- a/libstdc++/ChangeLog +++ b/libstdc++/ChangeLog @@ -1,3 +1,8 @@ +1998-01-05 Brendan Kehoe <brendan@lisa.cygnus.com> + + * std/bastring.cc (basic_string::Rep::operator delete): Don't claim + to return from deallocate, since this is a void method. + Sat Jan 3 12:15:41 1998 Franz Sirl <franz.sirl-kernel@lauterbach.com> * configure.in: Finalize support for {alpha|powerpc}*-*-linux-gnulibc1 diff --git a/libstdc++/std/bastring.cc b/libstdc++/std/bastring.cc index b5be65f3ee3..7556ed9c609 100644 --- a/libstdc++/std/bastring.cc +++ b/libstdc++/std/bastring.cc @@ -40,9 +40,9 @@ template <class charT, class traits, class Allocator> inline void basic_string <charT, traits, Allocator>::Rep:: operator delete (void * ptr) { - return Allocator::deallocate(ptr, sizeof(Rep) + - reinterpret_cast<Rep *>(ptr)->res * - sizeof (charT)); + Allocator::deallocate(ptr, sizeof(Rep) + + reinterpret_cast<Rep *>(ptr)->res * + sizeof (charT)); } template <class charT, class traits, class Allocator> |
