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

[pf3gnuchains/gcc-fork.git] / libstdc++-v3 / include / ext / pb_ds / detail / pat_trie_ / const_child_iterator.hpp

diff --git a/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/const_child_iterator.hpp b/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/const_child_iterator.hpp
index d0e1ce9..bc349cf 100644 (file)
--- a/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/const_child_iterator.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/const_child_iterator.hpp
@@ -1,11 +1,11 @@
 // -*- C++ -*-
 
-// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+// Copyright (C) 2005, 2006, 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) any later
+// Foundation; either version 3, or (at your option) any later
 // version.
 
 // This library is distributed in the hope that it will be useful, but
@@ -13,20 +13,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.
-
-// 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.
+// 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/>.
 
 // Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
 
@@ -59,21 +53,18 @@ public:
 
 public:
   inline
-  const_iterator(node_pointer_pointer p_p_cur = NULL,  node_pointer_pointer p_p_end = NULL) : m_p_p_cur(p_p_cur),
-                                                                                             m_p_p_end(p_p_end)
+  const_iterator(node_pointer_pointer p_p_cur = NULL,  
+                node_pointer_pointer p_p_end = NULL) 
+  : m_p_p_cur(p_p_cur), m_p_p_end(p_p_end)
   { }
 
   inline bool
   operator==(const const_iterator& other) const
-  {
-    return (m_p_p_cur == other.m_p_p_cur);
-  }
+  { return m_p_p_cur == other.m_p_p_cur; }
 
   inline bool
   operator!=(const const_iterator& other) const
-  {
-    return (m_p_p_cur != other.m_p_p_cur);
-  }
+  { return m_p_p_cur != other.m_p_p_cur; }
 
   inline const_iterator& 
   operator++()
@@ -81,48 +72,40 @@ public:
     do
       ++m_p_p_cur;
     while (m_p_p_cur != m_p_p_end&& * m_p_p_cur == NULL);
-
-    return (*this);
+    return *this;
   }
 
   inline const_iterator
   operator++(int)
   {
     const_iterator ret_it(*this);
-
     operator++();
-
-    return (ret_it);
+    return ret_it;
   }
 
   const node_pointer_pointer
   operator->() const
   {
-    PB_DS_DBG_ONLY(assert_referencible();)
-
-      return (m_p_p_cur);
+    _GLIBCXX_DEBUG_ONLY(assert_referencible();)
+    return (m_p_p_cur);
   }
 
   const_node_pointer
   operator*() const
   {
-    PB_DS_DBG_ONLY(assert_referencible();)
-
-      return (*m_p_p_cur);
+    _GLIBCXX_DEBUG_ONLY(assert_referencible();)
+    return (*m_p_p_cur);
   }
 
 protected:
-#ifdef PB_DS_PAT_TRIE_DEBUG_
+#ifdef _GLIBCXX_DEBUG
   void
   assert_referencible() const
-  {
-    PB_DS_DBG_ASSERT(m_p_p_cur != m_p_p_end&& * m_p_p_cur != NULL);
-  }
-#endif // #ifdef PB_DS_PAT_TRIE_DEBUG_
+  { _GLIBCXX_DEBUG_ASSERT(m_p_p_cur != m_p_p_end&& * m_p_p_cur != NULL); }
+#endif 
 
 public:
   node_pointer_pointer m_p_p_cur;
-
   node_pointer_pointer m_p_p_end;
 };