From: pme <pme@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri, 25 May 2001 02:10:55 +0000 (+0000)
Subject: 2001-05-24  Phil Edwards  <pme@sources.redhat.com>
X-Git-Url: http://git.sourceforge.jp/view?p=pf3gnuchains%2Fgcc-fork.git;a=commitdiff_plain;h=33c2c5afa93f8ddc9d0b6c4948296cea4c2b2ff5

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.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@42556 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index e0aada4558a..98158f93084 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 edfcb5e517e..ee9f31c3ca6 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));
 }