OSDN Git Service

Licensing changes to GPLv3 resp. GPLv3 with GCC Runtime Exception.
[pf3gnuchains/gcc-fork.git] / libstdc++-v3 / include / ext / pb_ds / detail / gp_hash_table_map_ / gp_ht_map_.hpp
index bd6c186..4741afe 100644 (file)
@@ -1,11 +1,11 @@
 // -*- C++ -*-
 
-// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+// Copyright (C) 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) 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
 // 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.
 
 #include <iostream>
 #endif 
 #ifdef _GLIBCXX_DEBUG
-#include <ext/pb_ds/detail/map_debug_base.hpp>
+#include <ext/pb_ds/detail/debug_map_base.hpp>
 #endif
 #include <debug/debug.h>
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace detail
   {
@@ -89,8 +83,8 @@ namespace pb_ds
     types_traits<Key, Mapped, Allocator, Store_Hash>
 
 #ifdef _GLIBCXX_DEBUG
-#define PB_DS_MAP_DEBUG_BASE_C_DEC \
-    map_debug_base<Key, Eq_Fn, typename Allocator::template rebind<Key>::other::const_reference>
+#define PB_DS_DEBUG_MAP_BASE_C_DEC \
+    debug_map_base<Key, Eq_Fn, typename Allocator::template rebind<Key>::other::const_reference>
 #endif 
 
 #ifdef PB_DS_DATA_TRUE_INDICATOR
@@ -103,10 +97,6 @@ namespace pb_ds
 #define PB_DS_V2S(X) Mapped()
 #endif 
 
-#define PB_DS_STATIC_ASSERT(UNIQUE, E) \
-    typedef static_assert_dumclass<sizeof(static_assert<(bool)(E)>)> \
-    UNIQUE##static_assert_type
-
     template<typename Key,
             typename Mapped,
             typename Hash_Fn,
@@ -118,7 +108,7 @@ namespace pb_ds
             typename Resize_Policy>
     class PB_DS_CLASS_NAME :
 #ifdef _GLIBCXX_DEBUG
-      protected PB_DS_MAP_DEBUG_BASE_C_DEC,
+      protected PB_DS_DEBUG_MAP_BASE_C_DEC,
 #endif 
       public PB_DS_HASH_EQ_FN_C_DEC,
       public Resize_Policy,
@@ -127,8 +117,6 @@ namespace pb_ds
     {
     private:
       typedef PB_DS_TYPES_TRAITS_C_DEC traits_base;
-      typedef typename traits_base::store_extra_false_type store_hash_false_type;
-      typedef typename traits_base::store_extra_true_type store_hash_true_type;
       typedef typename traits_base::value_type value_type_;
       typedef typename traits_base::pointer pointer_;
       typedef typename traits_base::const_pointer const_pointer_;
@@ -158,7 +146,7 @@ namespace pb_ds
       typedef PB_DS_RANGED_PROBE_FN_C_DEC ranged_probe_fn_base;
 
 #ifdef _GLIBCXX_DEBUG
-      typedef PB_DS_MAP_DEBUG_BASE_C_DEC map_debug_base;
+      typedef PB_DS_DEBUG_MAP_BASE_C_DEC debug_base;
 #endif 
 
       typedef PB_DS_HASH_EQ_FN_C_DEC hash_eq_fn_base;
@@ -174,7 +162,7 @@ namespace pb_ds
 #undef PB_DS_GEN_POS
 
     public:
-      typedef Allocator allocator;
+      typedef Allocator allocator_type;
       typedef typename Allocator::size_type size_type;
       typedef typename Allocator::difference_type difference_type;
       typedef Hash_Fn hash_fn;
@@ -383,22 +371,22 @@ namespace pb_ds
       resize_imp(entry_array, size_type);
 
       inline void
-      resize_imp_reassign(entry_pointer, entry_array, store_hash_false_type);
+      resize_imp_reassign(entry_pointer, entry_array, false_type);
 
       inline void
-      resize_imp_reassign(entry_pointer, entry_array, store_hash_true_type);
+      resize_imp_reassign(entry_pointer, entry_array, true_type);
 
       inline size_type
-      find_ins_pos(const_key_reference, store_hash_false_type);
+      find_ins_pos(const_key_reference, false_type);
 
       inline comp_hash
-      find_ins_pos(const_key_reference, store_hash_true_type);
+      find_ins_pos(const_key_reference, true_type);
 
       inline std::pair<point_iterator, bool>
-      insert_imp(const_reference, store_hash_false_type);
+      insert_imp(const_reference, false_type);
 
       inline std::pair<point_iterator, bool>
-      insert_imp(const_reference, store_hash_true_type);
+      insert_imp(const_reference, true_type);
 
       inline pointer
       insert_new_imp(const_reference r_val, size_type pos)
@@ -416,7 +404,7 @@ namespace pb_ds
        p_e->m_stat = valid_entry_status;
        resize_base::notify_inserted(++m_num_used_e);
 
-       _GLIBCXX_DEBUG_ONLY(map_debug_base::insert_new(PB_DS_V2F(p_e->m_value));)
+       _GLIBCXX_DEBUG_ONLY(debug_base::insert_new(PB_DS_V2F(p_e->m_value));)
 
        _GLIBCXX_DEBUG_ONLY(assert_valid();)
        return &p_e->m_value;
@@ -442,7 +430,7 @@ namespace pb_ds
 
        resize_base::notify_inserted(++m_num_used_e);
 
-       _GLIBCXX_DEBUG_ONLY(map_debug_base::insert_new(PB_DS_V2F(p_e->m_value));)
+       _GLIBCXX_DEBUG_ONLY(debug_base::insert_new(PB_DS_V2F(p_e->m_value));)
 
        _GLIBCXX_DEBUG_ONLY(assert_valid();)
        return &p_e->m_value;
@@ -450,7 +438,7 @@ namespace pb_ds
 
 #ifdef PB_DS_DATA_TRUE_INDICATOR
       inline mapped_reference
-      subscript_imp(const_key_reference key, store_hash_false_type)
+      subscript_imp(const_key_reference key, false_type)
       {
        _GLIBCXX_DEBUG_ONLY(assert_valid();)
 
@@ -461,12 +449,12 @@ namespace pb_ds
        if (p_e->m_stat != valid_entry_status)
          return insert_new_imp(value_type(key, mapped_type()), pos)->second;
 
-       _GLIBCXX_DEBUG_ONLY(map_debug_base::check_key_exists(key);)       
+       _GLIBCXX_DEBUG_ONLY(debug_base::check_key_exists(key);)   
        return p_e->m_value.second;
       }
 
       inline mapped_reference
-      subscript_imp(const_key_reference key, store_hash_true_type)
+      subscript_imp(const_key_reference key, true_type)
       {
        _GLIBCXX_DEBUG_ONLY(assert_valid();)
 
@@ -477,13 +465,13 @@ namespace pb_ds
          return insert_new_imp(value_type(key, mapped_type()),
                                 pos_hash_pair)->second;
 
-       _GLIBCXX_DEBUG_ONLY(map_debug_base::check_key_exists(key));
+       _GLIBCXX_DEBUG_ONLY(debug_base::check_key_exists(key));
        return (m_entries + pos_hash_pair.first)->m_value.second;
       }
 #endif
 
       inline pointer
-      find_key_pointer(const_key_reference key, store_hash_false_type)
+      find_key_pointer(const_key_reference key, false_type)
       {
        const size_type hash = ranged_probe_fn_base::operator()(key);
        size_type i;
@@ -500,7 +488,7 @@ namespace pb_ds
              case empty_entry_status:
                {
                  resize_base::notify_find_search_end();
-                 _GLIBCXX_DEBUG_ONLY(map_debug_base::check_key_does_not_exist(key);)
+                 _GLIBCXX_DEBUG_ONLY(debug_base::check_key_does_not_exist(key);)
 
                    return NULL;
                }
@@ -509,7 +497,7 @@ namespace pb_ds
                if (hash_eq_fn_base::operator()(PB_DS_V2F(p_e->m_value), key))
                  {
                    resize_base::notify_find_search_end();
-                   _GLIBCXX_DEBUG_ONLY(map_debug_base::check_key_exists(key);)
+                   _GLIBCXX_DEBUG_ONLY(debug_base::check_key_exists(key);)
 
                    return pointer(&p_e->m_value);
                  }
@@ -523,13 +511,13 @@ namespace pb_ds
            resize_base::notify_find_search_collision();
          }
 
-       _GLIBCXX_DEBUG_ONLY(map_debug_base::check_key_does_not_exist(key);)
+       _GLIBCXX_DEBUG_ONLY(debug_base::check_key_does_not_exist(key);)
        resize_base::notify_find_search_end();
        return NULL;
       }
 
       inline pointer
-      find_key_pointer(const_key_reference key, store_hash_true_type)
+      find_key_pointer(const_key_reference key, true_type)
       {
        comp_hash pos_hash_pair = ranged_probe_fn_base::operator()(key);
        size_type i;
@@ -548,7 +536,7 @@ namespace pb_ds
              case empty_entry_status:
                {
                  resize_base::notify_find_search_end();
-                 _GLIBCXX_DEBUG_ONLY(map_debug_base::check_key_does_not_exist(key);)
+                 _GLIBCXX_DEBUG_ONLY(debug_base::check_key_does_not_exist(key);)
 
                  return NULL;
                }
@@ -559,7 +547,7 @@ namespace pb_ds
                                                key, pos_hash_pair.second))
                  {
                    resize_base::notify_find_search_end();
-                   _GLIBCXX_DEBUG_ONLY(map_debug_base::check_key_exists(key);)
+                   _GLIBCXX_DEBUG_ONLY(debug_base::check_key_exists(key);)
                    return pointer(&p_e->m_value);
                  }
                break;
@@ -572,7 +560,7 @@ namespace pb_ds
            resize_base::notify_find_search_collision();
          }
 
-       _GLIBCXX_DEBUG_ONLY(map_debug_base::check_key_does_not_exist(key);)
+       _GLIBCXX_DEBUG_ONLY(debug_base::check_key_does_not_exist(key);)
        resize_base::notify_find_search_end();
        return NULL;
       }
@@ -640,10 +628,10 @@ namespace pb_ds
 
 #ifdef _GLIBCXX_DEBUG
       void
-      assert_entry_array_valid(const entry_array, store_hash_false_type) const;
+      assert_entry_array_valid(const entry_array, false_type) const;
 
       void
-      assert_entry_array_valid(const entry_array, store_hash_true_type) const;
+      assert_entry_array_valid(const entry_array, true_type) const;
 #endif 
 
       static entry_allocator   s_entry_allocator;
@@ -657,7 +645,7 @@ namespace pb_ds
       enum
        {
          store_hash_ok = !Store_Hash 
-                         || !is_same<Hash_Fn, pb_ds::null_hash_fn>::value
+                         || !is_same<Hash_Fn, __gnu_pbds::null_hash_fn>::value
        };
 
       PB_DS_STATIC_ASSERT(sth, store_hash_ok);
@@ -679,12 +667,11 @@ namespace pb_ds
 #undef PB_DS_HASH_EQ_FN_C_DEC
 #undef PB_DS_RANGED_PROBE_FN_C_DEC
 #undef PB_DS_TYPES_TRAITS_C_DEC
-#undef PB_DS_MAP_DEBUG_BASE_C_DEC
+#undef PB_DS_DEBUG_MAP_BASE_C_DEC
 #undef PB_DS_CLASS_NAME
 #undef PB_DS_V2F
 #undef PB_DS_V2S
-#undef PB_DS_STATIC_ASSERT
 
   } // namespace detail
-} // namespace pb_ds
+} // namespace __gnu_pbds