GCC 4.2.0 release C++ standard library and runtime support code.

1 files changed, 7 insertions, 12 deletions

diff --git a/contrib/libstdc++/include/bits/mask_array.h b/contrib/libstdc++/include/bits/mask_array.h
index 1a694f3..98c8bfb 100644
--- a/contrib/libstdc++/include/bits/mask_array.h
+++ b/contrib/libstdc++/include/bits/mask_array.h
@@ -1,6 +1,6 @@
 // The template and inlines for the -*- C++ -*- mask_array class.
 
-// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2004
+// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2004, 2005
 //  Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
@@ -16,7 +16,7 @@
 
 // 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,
+// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
 // USA.
 
 // As a special exception, you may use this file as part of a free software
@@ -28,19 +28,19 @@
 // invalidate any other reasons why the executable file might be covered by
 // the GNU General Public License.
 
-// Written by Gabriel Dos Reis <Gabriel.Dos-Reis@DPTMaths.ENS-Cachan.Fr>
-
 /** @file mask_array.h
  *  This is an internal header file, included by other library headers.
  *  You should not attempt to use it directly.
  */
 
+// Written by Gabriel Dos Reis <Gabriel.Dos-Reis@DPTMaths.ENS-Cachan.Fr>
+
 #ifndef _MASK_ARRAY_H
 #define _MASK_ARRAY_H 1
 
 #pragma GCC system_header
 
-namespace std {
+_GLIBCXX_BEGIN_NAMESPACE(std)
 
   /**
    *  @brief  Reference to selected subset of an array.
@@ -128,13 +128,12 @@ namespace std {
 
       const size_t       _M_sz;
       const _Array<bool> _M_mask;
-      const _Array<_Tp>   _M_array;
+      const _Array<_Tp>  _M_array;
 
       // not implemented
       mask_array();
     };
 
-
   template<typename _Tp>
     inline mask_array<_Tp>::mask_array(const mask_array<_Tp>& a)
     : _M_sz(a._M_sz), _M_mask(a._M_mask), _M_array(a._M_array) {}
@@ -200,10 +199,6 @@ _DEFINE_VALARRAY_OPERATOR(>>, __shift_right)
 
 #undef _DEFINE_VALARRAY_OPERATOR
 
-} // std::
+_GLIBCXX_END_NAMESPACE
 
 #endif /* _MASK_ARRAY_H */
-
-// Local Variables:
-// mode:c++
-// End: