Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into multimap
Browse files Browse the repository at this point in the history
  • Loading branch information
VitoCastellana committed Feb 8, 2022
2 parents 11f7c54 + a425cc2 commit 1a805cb
Show file tree
Hide file tree
Showing 10 changed files with 1,814 additions and 29 deletions.
2 changes: 1 addition & 1 deletion include/shad/core/array.h
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ class array : public AbstractDataStructure<array<T, N>> {
auto This = array<T, N>::GetPtr(std::get<0>(IDs));
auto Other = array<T, N>::GetPtr(std::get<1>(IDs));

std::copy(Other->chunk_, Other->chunk_ + chunk_size(), This->churk_);
std::copy(Other->chunk_, Other->chunk_ + chunk_size(), This->chunk_);
},
std::make_pair(this->oid_, O.oid_));
return *this;
Expand Down
Loading

0 comments on commit 1a805cb

Please sign in to comment.