aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libstdc++/ChangeLog5
-rw-r--r--libstdc++/std/bastring.cc6
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>