From: Phil Edwards <pme@gcc.gnu.org>
Date: Fri, 25 May 2001 02:10:55 +0000 (+0000)
Subject: eh_alloc.cc (__cxa_allocate_exception): Qualify malloc with std:: .
X-Git-Tag: prereleases/libstdc++-3.0.95~4208
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1044b043c229a4fbc17be667a16900f32c12710d;p=thirdparty%2Fgcc.git

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
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index e0aada4558aa..98158f930842 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 edfcb5e517e4..ee9f31c3ca62 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));
 }