X-Git-Url: https://oss.titaniummirror.com/gitweb?a=blobdiff_plain;f=libstdc%2B%2B-v3%2Finclude%2Fbits%2Fstl_raw_storage_iter.h;fp=libstdc%2B%2B-v3%2Finclude%2Fbits%2Fstl_raw_storage_iter.h;h=de6cad97042bda0868f7e59568cde645425cb510;hb=6fed43773c9b0ce596dca5686f37ac3fc0fa11c0;hp=59aa004296e8815e70e70c11980c6f664eaf87d3;hpb=27b11d56b743098deb193d510b337ba22dc52e5c;p=msp430-gcc.git

diff --git a/libstdc++-v3/include/bits/stl_raw_storage_iter.h b/libstdc++-v3/include/bits/stl_raw_storage_iter.h
index 59aa0042..de6cad97 100644
--- a/libstdc++-v3/include/bits/stl_raw_storage_iter.h
+++ b/libstdc++-v3/include/bits/stl_raw_storage_iter.h
@@ -1,11 +1,12 @@
 // -*- C++ -*-
 
-// Copyright (C) 2001 Free Software Foundation, Inc.
+// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 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/>.
 
 /*
  *
@@ -58,55 +54,53 @@
  *  You should not attempt to use it directly.
  */
 
-#ifndef _CPP_BITS_STL_RAW_STORAGE_ITERATOR_H
-#define _CPP_BITS_STL_RAW_STORAGE_ITERATOR_H 1
+#ifndef _STL_RAW_STORAGE_ITERATOR_H
+#define _STL_RAW_STORAGE_ITERATOR_H 1
+
+_GLIBCXX_BEGIN_NAMESPACE(std)
 
-namespace std
-{
   /**
    *  This iterator class lets algorithms store their results into
    *  uninitialized memory.
   */
-  template <class _ForwardIterator, class _Tp>
-  class raw_storage_iterator 
+  template <class _OutputIterator, class _Tp>
+    class raw_storage_iterator
     : public iterator<output_iterator_tag, void, void, void, void>
     {
     protected:
-      _ForwardIterator _M_iter;
+      _OutputIterator _M_iter;
 
     public:
-      explicit 
-      raw_storage_iterator(_ForwardIterator __x) : _M_iter(__x) {}
+      explicit
+      raw_storage_iterator(_OutputIterator __x)
+      : _M_iter(__x) {}
 
-      raw_storage_iterator& 
+      raw_storage_iterator&
       operator*() { return *this; }
 
-      raw_storage_iterator& 
-      operator=(const _Tp& __element) 
+      raw_storage_iterator&
+      operator=(const _Tp& __element)
       {
-	_Construct(&*_M_iter, __element);
+	std::_Construct(&*_M_iter, __element);
 	return *this;
-      }        
+      }
 
-      raw_storage_iterator<_ForwardIterator, _Tp>& 
-      operator++() 
+      raw_storage_iterator<_OutputIterator, _Tp>&
+      operator++()
       {
 	++_M_iter;
 	return *this;
       }
 
-      raw_storage_iterator<_ForwardIterator, _Tp> 
-      operator++(int) 
+      raw_storage_iterator<_OutputIterator, _Tp>
+      operator++(int)
       {
-	raw_storage_iterator<_ForwardIterator, _Tp> __tmp = *this;
+	raw_storage_iterator<_OutputIterator, _Tp> __tmp = *this;
 	++_M_iter;
 	return __tmp;
       }
     };
-} // namespace std
 
-#endif
+_GLIBCXX_END_NAMESPACE
 
-// Local Variables:
-// mode:C++
-// End:
+#endif