Licensing changes to GPLv3 resp. GPLv3 with GCC Runtime Exception.

[pf3gnuchains/gcc-fork.git] / libstdc++-v3 / include / debug / safe_iterator.tcc

diff --git a/libstdc++-v3/include/debug/safe_iterator.tcc b/libstdc++-v3/include/debug/safe_iterator.tcc
index ac9a09a..d4f2aee 100644 (file)
--- a/libstdc++-v3/include/debug/safe_iterator.tcc
+++ b/libstdc++-v3/include/debug/safe_iterator.tcc
@@ -1,12 +1,12 @@
 // Debugging iterator implementation (out of line) -*- C++ -*-
 
-// Copyright (C) 2003, 2004, 2005, 2006
+// Copyright (C) 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,
@@ -14,23 +14,17 @@
 // 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, 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
-// 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.
-
-/** @file safe_iterator.tcc
- *  This is an internal header file, included by other library headers.
- *  You should not attempt to use it directly.
+// 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.
+
+// 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/>.
+
+/** @file debug/safe_iterator.tcc
+ *  This file is a GNU debug extension to the Standard C++ Library.
  */
 
 #ifndef _GLIBCXX_DEBUG_SAFE_ITERATOR_TCC
@@ -55,8 +49,8 @@ namespace __gnu_debug
            static_cast<const _Sequence*>(_M_sequence)->begin();
          std::pair<difference_type, _Distance_precision> __dist =
            this->_M_get_distance(__begin, *this);
-         bool __ok =  (__dist.second == __dp_exact && __dist.first >= -__n
-                       || __dist.second != __dp_exact && __dist.first > 0);
+         bool __ok =  ((__dist.second == __dp_exact && __dist.first >= -__n)
+                       || (__dist.second != __dp_exact && __dist.first > 0));
          return __ok;
        }
       else
@@ -65,8 +59,8 @@ namespace __gnu_debug
            static_cast<const _Sequence*>(_M_sequence)->end();
          std::pair<difference_type, _Distance_precision> __dist =
            this->_M_get_distance(*this, __end);
-         bool __ok = (__dist.second == __dp_exact && __dist.first >= __n
-                      || __dist.second != __dp_exact && __dist.first > 0);
+         bool __ok = ((__dist.second == __dp_exact && __dist.first >= __n)
+                      || (__dist.second != __dp_exact && __dist.first > 0));
          return __ok;
        }
     }
@@ -111,23 +105,32 @@ namespace __gnu_debug
     _Safe_iterator<_Iterator, _Sequence>::
     _M_invalidate()
     {
+      __gnu_cxx::__scoped_lock sentry(this->_M_get_mutex());
+      _M_invalidate_single();
+    }
+
+  template<typename _Iterator, typename _Sequence>
+    void
+    _Safe_iterator<_Iterator, _Sequence>::
+    _M_invalidate_single()
+    {
       typedef typename _Sequence::iterator iterator;
       typedef typename _Sequence::const_iterator const_iterator;
 
       if (!this->_M_singular())
        {
-         for (_Safe_iterator_base* iter = _M_sequence->_M_iterators; iter;)
+         for (_Safe_iterator_base* __iter = _M_sequence->_M_iterators;
+              __iter; __iter = __iter->_M_next)
            {
-             iterator* __victim = static_cast<iterator*>(iter);
-             iter = iter->_M_next;
+             iterator* __victim = static_cast<iterator*>(__iter);
              if (this->base() == __victim->base())
                __victim->_M_version = 0;
            }
-         for (_Safe_iterator_base* iter = _M_sequence->_M_const_iterators;
-              iter;)
+
+         for (_Safe_iterator_base* __iter2 = _M_sequence->_M_const_iterators;
+              __iter2; __iter2 = __iter2->_M_next)
            {
-             const_iterator* __victim = static_cast<const_iterator*>(iter);
-             iter = iter->_M_next;
+             const_iterator* __victim = static_cast<const_iterator*>(__iter2);
              if (__victim->base() == this->base())
                __victim->_M_version = 0;
            }