Skip to content

Update ChunkContainer.hpp #152

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Nov 30, 2024
Merged

Update ChunkContainer.hpp #152

Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
472a34b
Update ChunkContainer.hpp
rghouzra Nov 28, 2024
5567773
Merge branch 'main' into patch-2
rghouzra Nov 29, 2024
203961b
Update src/XAD/ChunkContainer.hpp
auto-differentiation-dev Nov 29, 2024
d99d5cb
Update src/XAD/ChunkContainer.hpp
auto-differentiation-dev Nov 29, 2024
7329653
Remove unintended changes
auto-differentiation-dev Nov 29, 2024
c62b85f
More reverting of unintended changes
auto-differentiation-dev Nov 29, 2024
d27c29f
Update src/XAD/ChunkContainer.hpp
auto-differentiation-dev Nov 29, 2024
3deb47e
Fixes spacing
auto-differentiation-dev Nov 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 14 additions & 12 deletions src/XAD/ChunkContainer.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,24 +133,26 @@ class ChunkContainer
}

ChunkContainer(ChunkContainer&& o) noexcept
: chunkList_(std::move(o.chunkList_)), chunk_(o.chunk_), idx_(o.idx_)
{
: chunkList_(std::move(o.chunkList_)), chunk_(o.chunk_), idx_(o.idx_) {
o.chunk_ = 0;
o.idx_ = 0;
}

ChunkContainer& operator=(ChunkContainer&& o)
{
_free_memory();
chunkList_ = std::move(o.chunkList_);
chunk_ = o.chunk_;
idx_ = o.idx_;
ChunkContainer& operator=(ChunkContainer&& o) noexcept {
if (this != &o) {
_free_memory();
chunkList_ = std::move(o.chunkList_);
chunk_ = o.chunk_;
idx_ = o.idx_;
o.chunk_ = 0;
o.idx_ = 0;
}
return *this;
}

ChunkContainer(const ChunkContainer&) = delete;
ChunkContainer& operator=(const ChunkContainer&) = delete;

~ChunkContainer() { _free_memory(); }

void reserve(size_type s)
{
size_type nc = getNumChunks(s);
Expand Down Expand Up @@ -438,15 +440,15 @@ class ChunkContainer
private:
std::vector<char*> chunkList_;
size_type chunk_, idx_;

void check_space()
{
if (XAD_VERY_LIKELY(chunk_ == chunkList_.size() - 1))
{
char* chunk = reinterpret_cast<char*>(
detail::aligned_alloc(ALIGNMENT, sizeof(value_type) * chunk_size));
if (chunk == NULL)
if (chunk == nullptr) {
throw std::bad_alloc();
}
chunkList_.push_back(chunk);
}
++chunk_;
Expand Down
Loading