Update copyright years.

[thirdparty/gcc.git] / libstdc++-v3 / include / ext / pb_ds / detail / rc_binomial_heap_ / erase_fn_imps.hpp

diff --git a/libstdc++-v3/include/ext/pb_ds/detail/rc_binomial_heap_/erase_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/rc_binomial_heap_/erase_fn_imps.hpp
index 2e6bc3dd91f3bfcff9e3987e7119d72e6b89740d..2ba79e5fd74b024c145c474e9b78540f5156a66f 100644 (file)
--- a/libstdc++-v3/include/ext/pb_ds/detail/rc_binomial_heap_/erase_fn_imps.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/detail/rc_binomial_heap_/erase_fn_imps.hpp
@@ -1,11 +1,11 @@
 // -*- C++ -*-
 
-// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+// Copyright (C) 2005-2020 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.
+// 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/>.
 
 // Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
 
@@ -40,21 +34,20 @@
 // warranty.
 
 /**
- * @file erase_fn_imps.hpp
+ * @file rc_binomial_heap_/erase_fn_imps.hpp
  * Contains an implementation for rc_binomial_heap_.
  */
 
+#ifdef PB_DS_CLASS_C_DEC
+
 PB_DS_CLASS_T_DEC
 inline void
 PB_DS_CLASS_C_DEC::
 pop()
 {
   make_binomial_heap();
-
-  PB_DS_DBG_ASSERT(!base_type::empty());
-
+  _GLIBCXX_DEBUG_ASSERT(!base_type::empty());
   base_type::pop();
-
   base_type::find_max();
 }
 
@@ -64,7 +57,6 @@ PB_DS_CLASS_C_DEC::
 clear()
 {
   base_type::clear();
-
   m_rc.clear();
 }
 
@@ -74,21 +66,19 @@ PB_DS_CLASS_C_DEC::
 make_binomial_heap()
 {
   node_pointer p_nd = base_type::m_p_root;
-
-  while (p_nd != NULL)
+  while (p_nd != 0)
     {
       node_pointer p_next = p_nd->m_p_next_sibling;
-
-      if (p_next == NULL)
+      if (p_next == 0)
        p_nd = p_next;
       else if (p_nd->m_metadata == p_next->m_metadata)
        p_nd = link_with_next_sibling(p_nd);
       else if (p_nd->m_metadata < p_next->m_metadata)
        p_nd = p_next;
-#ifdef PB_DS_RC_BINOMIAL_HEAP__DEBUG_
+#ifdef _GLIBCXX_DEBUG
       else
-       PB_DS_DBG_ASSERT(0);
-#endif // #ifdef PB_DS_RC_BINOMIAL_HEAP__DEBUG_
+       _GLIBCXX_DEBUG_ASSERT(0);
+#endif 
     }
 
   m_rc.clear();
@@ -101,14 +91,10 @@ PB_DS_CLASS_C_DEC::
 erase_if(Pred pred)
 {
   make_binomial_heap();
-
   const size_type ersd = base_type::erase_if(pred);
-
   base_type::find_max();
-
-  PB_DS_DBG_ONLY(assert_valid();)
-
-    return ersd;
+  PB_DS_ASSERT_VALID((*this))
+  return ersd;
 }
 
 PB_DS_CLASS_T_DEC
@@ -117,9 +103,8 @@ PB_DS_CLASS_C_DEC::
 erase(point_iterator it)
 {
   make_binomial_heap();
-
   base_type::erase(it);
-
   base_type::find_max();
 }
 
+#endif