2011-08-06 Benjamin Kosnik <bkoz@redhat.com>

[pf3gnuchains/gcc-fork.git] / libstdc++-v3 / include / ext / memory

diff --git a/libstdc++-v3/include/ext/memory b/libstdc++-v3/include/ext/memory
index 6244c0e..0f2e82e 100644 (file)
--- a/libstdc++-v3/include/ext/memory
+++ b/libstdc++-v3/include/ext/memory
@@ -1,11 +1,12 @@
 // Memory extensions -*- C++ -*-
 
-// Copyright (C) 2002, 2004 Free Software Foundation, Inc.
+// Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+// Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
 // terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
+// Free Software Foundation; either version 3, or (at your option)
 // any later version.
 
 // This library is distributed in the hope that it will be useful,
@@ -13,19 +14,14 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
+// Under Section 7 of GPL version 3, you are granted additional
+// permissions described in the GCC Runtime Library Exception, version
+// 3.1, as published by the Free Software Foundation.
 
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
+// You should have received a copy of the GNU General Public License and
+// a copy of the GCC Runtime Library Exception along with this program;
+// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+// <http://www.gnu.org/licenses/>.
 
 /*
  *
@@ -66,8 +62,10 @@
 #include <memory>
 #include <bits/stl_tempbuf.h>
 
-namespace __gnu_cxx
+namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
 {
+_GLIBCXX_BEGIN_NAMESPACE_VERSION
+
   using std::ptrdiff_t;
   using std::pair;
   using std::__iterator_category;
@@ -79,13 +77,13 @@ namespace __gnu_cxx
                           _ForwardIter __result, std::input_iterator_tag)
     {
       _ForwardIter __cur = __result;
-      try
+      __try
        {
          for (; __count > 0 ; --__count, ++__first, ++__cur)
            std::_Construct(&*__cur, *__first);
          return pair<_InputIter, _ForwardIter>(__first, __cur);
        }
-      catch(...)
+      __catch(...)
        {
          std::_Destroy(__result, __cur);
          __throw_exception_again;
@@ -106,16 +104,16 @@ namespace __gnu_cxx
   template<typename _InputIter, typename _Size, typename _ForwardIter>
     inline pair<_InputIter, _ForwardIter>
     __uninitialized_copy_n(_InputIter __first, _Size __count,
-                        _ForwardIter __result)
-    { return __uninitialized_copy_n(__first, __count, __result,
-                                   __iterator_category(__first)); }
+                          _ForwardIter __result)
+    { return __gnu_cxx::__uninitialized_copy_n(__first, __count, __result,
+                                              __iterator_category(__first)); }
 
   /**
    *  @brief Copies the range [first,last) into result.
-   *  @param  first  An input iterator.
-   *  @param  last   An input iterator.
-   *  @param  result An output iterator.
-   *  @return   result + (first - last)
+   *  @param  __first  An input iterator.
+   *  @param  __count  Length
+   *  @param  __result An output iterator.
+   *  @return   __result + (__first + __count)
    *  @ingroup SGIextensions
    *
    *  Like copy(), but does not require an initialized output range.
@@ -124,8 +122,8 @@ namespace __gnu_cxx
     inline pair<_InputIter, _ForwardIter>
     uninitialized_copy_n(_InputIter __first, _Size __count,
                         _ForwardIter __result)
-    { return __uninitialized_copy_n(__first, __count, __result,
-                                   __iterator_category(__first)); }
+    { return __gnu_cxx::__uninitialized_copy_n(__first, __count, __result,
+                                              __iterator_category(__first)); }
 
 
   // An alternative version of uninitialized_copy_n that constructs
@@ -138,13 +136,13 @@ namespace __gnu_cxx
                             _Allocator __alloc)
     {
       _ForwardIter __cur = __result;
-      try
+      __try
        {
          for (; __count > 0 ; --__count, ++__first, ++__cur)
            __alloc.construct(&*__cur, *__first);
          return pair<_InputIter, _ForwardIter>(__first, __cur);
        }
-      catch(...)
+      __catch(...)
        {
          std::_Destroy(__result, __cur, __alloc);
          __throw_exception_again;
@@ -158,7 +156,7 @@ namespace __gnu_cxx
                             _ForwardIter __result,
                             std::allocator<_Tp>)
     {
-      return uninitialized_copy_n(__first, __count, __result);
+      return __gnu_cxx::uninitialized_copy_n(__first, __count, __result);
     }
 
   /**
@@ -192,7 +190,9 @@ namespace __gnu_cxx
       /// Destroys objects and frees storage.
       ~temporary_buffer() { }
     };
-} // namespace __gnu_cxx
+
+_GLIBCXX_END_NAMESPACE_VERSION
+} // namespace
 
 #endif