Update copyright years.

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

diff --git a/libstdc++-v3/include/ext/pb_ds/detail/pairing_heap_/insert_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/pairing_heap_/insert_fn_imps.hpp
index d3ebfbd453e24133542af6ed1ad6bfab37c2651e..64f0f73387ac276f148823690b4d7f8fec0441f3 100644 (file)
--- a/libstdc++-v3/include/ext/pb_ds/detail/pairing_heap_/insert_fn_imps.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/detail/pairing_heap_/insert_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,24 +34,22 @@
 // warranty.
 
 /**
- * @file insert_fn_imps.hpp
+ * @file pairing_heap_/insert_fn_imps.hpp
  * Contains an implementation class for a pairing heap.
  */
 
+#ifdef PB_DS_CLASS_C_DEC
+
 PB_DS_CLASS_T_DEC
 inline typename PB_DS_CLASS_C_DEC::point_iterator
 PB_DS_CLASS_C_DEC::
 push(const_reference r_val)
 {
-  PB_DS_DBG_ONLY(assert_valid();)
-
-    node_pointer p_new_nd = base_type::get_new_node_for_insert(r_val);
-
+  PB_DS_ASSERT_VALID((*this))
+  node_pointer p_new_nd = base_type::get_new_node_for_insert(r_val);
   push_imp(p_new_nd);
-
-  PB_DS_DBG_ONLY(assert_valid();)
-
-    return point_iterator(p_new_nd);
+  PB_DS_ASSERT_VALID((*this))
+  return point_iterator(p_new_nd);
 }
 
 PB_DS_CLASS_T_DEC
@@ -65,27 +57,23 @@ inline void
 PB_DS_CLASS_C_DEC::
 push_imp(node_pointer p_nd)
 {
-  p_nd->m_p_l_child = NULL;
-
-  if (base_type::m_p_root == NULL)
+  p_nd->m_p_l_child = 0;
+  if (base_type::m_p_root == 0)
     {
-      p_nd->m_p_next_sibling = p_nd->m_p_prev_or_parent = NULL;
-
+      p_nd->m_p_next_sibling = p_nd->m_p_prev_or_parent = 0;
       base_type::m_p_root = p_nd;
     }
   else if (Cmp_Fn::operator()(base_type::m_p_root->m_value, p_nd->m_value))
     {
-      p_nd->m_p_next_sibling = p_nd->m_p_prev_or_parent = NULL;
-
+      p_nd->m_p_next_sibling = p_nd->m_p_prev_or_parent = 0;
       base_type::make_child_of(base_type::m_p_root, p_nd);
-      PB_DS_DBG_ONLY(base_type::assert_node_consistent(p_nd, false));
-
+      PB_DS_ASSERT_NODE_CONSISTENT(p_nd, false)
       base_type::m_p_root = p_nd;
     }
   else
     {
       base_type::make_child_of(p_nd, base_type::m_p_root);
-      PB_DS_DBG_ONLY(base_type::assert_node_consistent(base_type::m_p_root, false));
+      PB_DS_ASSERT_NODE_CONSISTENT(base_type::m_p_root, false)
     }
 }
 
@@ -94,14 +82,10 @@ void
 PB_DS_CLASS_C_DEC::
 modify(point_iterator it, const_reference r_new_val)
 {
-  PB_DS_DBG_ONLY(assert_valid();)
-
-    remove_node(it.m_p_nd);
-
+  PB_DS_ASSERT_VALID((*this))
+  remove_node(it.m_p_nd);
   it.m_p_nd->m_value = r_new_val;
-
   push_imp(it.m_p_nd);
-
-  PB_DS_DBG_ONLY(assert_valid();)
-    }
-
+  PB_DS_ASSERT_VALID((*this))
+}
+#endif