aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Edwards <pme@gcc.gnu.org>2001-05-25 02:10:55 +0000
committerPhil Edwards <pme@gcc.gnu.org>2001-05-25 02:10:55 +0000
commit1044b043c229a4fbc17be667a16900f32c12710d (patch)
treee128b0b6e3b69c743286c362e6cff3995736cdc4
parenteeff8d2c06afac42374bc74a8e138d4bf981fc52 (diff)
downloadgcc-1044b043c229a4fbc17be667a16900f32c12710d.zip
gcc-1044b043c229a4fbc17be667a16900f32c12710d.tar.gz
gcc-1044b043c229a4fbc17be667a16900f32c12710d.tar.bz2
eh_alloc.cc (__cxa_allocate_exception): Qualify malloc with std:: .
2001-05-24 Phil Edwards <pme@sources.redhat.com> * libsupc++/eh_alloc.cc (__cxa_allocate_exception): Qualify malloc with std:: . (__cxa_free_exception): Likewise with free. From-SVN: r42556
-rw-r--r--libstdc++-v3/ChangeLog6
-rw-r--r--libstdc++-v3/libsupc++/eh_alloc.cc4
2 files changed, 8 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index e0aada4..98158f9 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2001-05-24 Phil Edwards <pme@sources.redhat.com>
+
+ * libsupc++/eh_alloc.cc (__cxa_allocate_exception): Qualify
+ malloc with std:: .
+ (__cxa_free_exception): Likewise with free.
+
2001-05-24 Mark Mitchell <mark@codesourcery.com>
* include/c_std/bin/std_cstring.h: #define away all global
diff --git a/libstdc++-v3/libsupc++/eh_alloc.cc b/libstdc++-v3/libsupc++/eh_alloc.cc
index edfcb5e..ee9f31c 100644
--- a/libstdc++-v3/libsupc++/eh_alloc.cc
+++ b/libstdc++-v3/libsupc++/eh_alloc.cc
@@ -98,7 +98,7 @@ __cxa_allocate_exception(std::size_t thrown_size)
void *ret;
thrown_size += sizeof (__cxa_exception);
- ret = malloc (thrown_size);
+ ret = std::malloc (thrown_size);
if (! ret)
{
@@ -158,5 +158,5 @@ __cxa_free_exception(void *vptr)
#endif
}
else
- free (ptr - sizeof (__cxa_exception));
+ std::free (ptr - sizeof (__cxa_exception));
}