2007-05-13 Paolo Carlini <pcarlini@suse.de>

	* include/bits/stl_tempbuf.h (return_temporary_buffer(_Tp*)): Inline.

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

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index e460524..c259322 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,9 @@
 2007-05-13  Paolo Carlini  <pcarlini@suse.de>
 
+       * include/bits/stl_tempbuf.h (return_temporary_buffer(_Tp*)): Inline.
+
+2007-05-13  Paolo Carlini  <pcarlini@suse.de>
+
        * include/tr1/type_traitsfwd.h: Fix include guard typo.
 
 2007-05-11  Paolo Carlini  <pcarlini@suse.de>

diff --git a/libstdc++-v3/include/bits/stl_tempbuf.h b/libstdc++-v3/include/bits/stl_tempbuf.h
index 46c733f..9cf1620 100644 (file)
--- a/libstdc++-v3/include/bits/stl_tempbuf.h
+++ b/libstdc++-v3/include/bits/stl_tempbuf.h
@@ -124,9 +124,9 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
    *  Frees the memory pointed to by p.
    */
   template<typename _Tp>
-    void
+    inline void
     return_temporary_buffer(_Tp* __p)
-    { ::operator delete(__p, nothrow); }
+    { ::operator delete(__p, std::nothrow); }
 
 
   /**