diff options
| author | Brendan Kehoe <brendan@lisa.cygnus.com> | 1998-01-05 18:35:07 +0000 |
|---|---|---|
| committer | Brendan Kehoe <brendan@gcc.gnu.org> | 1998-01-05 13:35:07 -0500 |
| commit | b450b6999c574123b3abb03979882ca35b4caa3a (patch) | |
| tree | 1ba061222a2c9bd69668f3e4c84edfaac2e97d9d | |
| parent | 1c72c7f64f6bc118f73aced5df31dc32e299e800 (diff) | |
| download | gcc-b450b6999c574123b3abb03979882ca35b4caa3a.zip gcc-b450b6999c574123b3abb03979882ca35b4caa3a.tar.gz gcc-b450b6999c574123b3abb03979882ca35b4caa3a.tar.bz2 | |
bastring.cc (basic_string::Rep::operator delete): Don't claim to return from deallocate, since this is a void method.
* std/bastring.cc (basic_string::Rep::operator delete): Don't claim
to return from deallocate, since this is a void method.
From-SVN: r17297
| -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 b53b779..ffe617a 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 b5be65f..7556ed9 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> |