File tree Expand file tree Collapse file tree 1 file changed +7
-6
lines changed Expand file tree Collapse file tree 1 file changed +7
-6
lines changed Original file line number Diff line number Diff line change @@ -114,8 +114,9 @@ void Bucket::init_heap(const DeviceGrid& grid) {
114
114
heap_ = nullptr ;
115
115
116
116
heap_size_ = (grid.width () - 1 ) * (grid.height () - 1 );
117
+
117
118
heap_ = new BucketItem*[heap_size_];
118
- for (int i = 0 ; i < (int )heap_size_; i++)
119
+ for (size_t i = 0 ; i < (size_t )heap_size_; i++)
119
120
heap_[i] = 0 ;
120
121
121
122
heap_head_ = std::numeric_limits<size_t >::max ();
@@ -142,14 +143,14 @@ void Bucket::free_all_memory() {
142
143
void Bucket::expand (size_t required_number_of_buckets) {
143
144
auto old_size = heap_size_;
144
145
heap_size_ = required_number_of_buckets * 2 ;
145
- int i;
146
+ size_t i;
146
147
147
- BucketItem** temp = new BucketItem*[old_size];
148
- memcpy (temp, heap_, old_size);
148
+ std::vector<BucketItem*> temp (heap_, heap_ + old_size);
149
149
delete[] heap_;
150
150
heap_ = new BucketItem*[heap_size_];
151
- heap_ = temp;
152
- for (i = old_size; i < heap_size_; i++)
151
+ for (i = 0 ; i < old_size; i++)
152
+ heap_[i] = temp[i];
153
+ for (i = temp.size (); i < heap_size_; i++)
153
154
heap_[i] = nullptr ;
154
155
}
155
156
You can’t perform that action at this time.
0 commit comments