diff options
author | Chris Dyer <cdyer@cab.ark.cs.cmu.edu> | 2012-08-12 21:56:58 -0400 |
---|---|---|
committer | Chris Dyer <cdyer@cab.ark.cs.cmu.edu> | 2012-08-12 21:56:58 -0400 |
commit | 2c4453984060dd039b8a99e5a8d98dbc107588b9 (patch) | |
tree | 022960fd3edc1b97260cfef67b804879ecb6c1f4 /utils/fast_sparse_vector.h | |
parent | 08030aee204975c2d187c5a8d0dabbc67799a104 (diff) |
possible errors with google hashes
Diffstat (limited to 'utils/fast_sparse_vector.h')
-rw-r--r-- | utils/fast_sparse_vector.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/utils/fast_sparse_vector.h b/utils/fast_sparse_vector.h index 5647a2a9..9fe00459 100644 --- a/utils/fast_sparse_vector.h +++ b/utils/fast_sparse_vector.h @@ -13,6 +13,7 @@ #include <map> #include <cassert> #include <vector> +#include <limits> #ifdef HAVE_CONFIG_H #include "config.h" @@ -192,6 +193,7 @@ class FastSparseVector { } else { is_remote_ = true; data_.rbmap = new SPARSE_HASH_MAP<unsigned, T>(first, last); + HASH_MAP_DELETED(*data_.rbmap, std::numeric_limits<unsigned>::max()); } } void erase(unsigned k) { @@ -213,8 +215,11 @@ class FastSparseVector { if (&other == this) return *this; clear(); std::memcpy(this, &other, sizeof(FastSparseVector)); - if (is_remote_) + if (is_remote_) { data_.rbmap = new SPARSE_HASH_MAP<unsigned, T>(*data_.rbmap); + // TODO: do i need to set_deleted on a copy? + HASH_MAP_DELETED(*data_.rbmap, std::numeric_limits<unsigned>::max()); + } return *this; } T const& get_singleton() const { @@ -445,6 +450,7 @@ class FastSparseVector { SPARSE_HASH_MAP<unsigned, T>* m = new SPARSE_HASH_MAP<unsigned, T>( reinterpret_cast<std::pair<unsigned, T>*>(&data_.local[0]), reinterpret_cast<std::pair<unsigned, T>*>(&data_.local[local_size_]), local_size_ * 1.5 + 1); + HASH_MAP_DELETED(*m, std::numeric_limits<unsigned>::max()); data_.rbmap = m; is_remote_ = true; } |