Skip to content

Commit

Permalink
Merge remote-tracking branch 'github/master' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
kimlaine committed May 23, 2024
2 parents a01b50b + a3d00b6 commit 1a5676d
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
6 changes: 4 additions & 2 deletions native/src/seal/util/iterator.h
Original file line number Diff line number Diff line change
Expand Up @@ -1837,7 +1837,8 @@ namespace seal

IterTuple() = default;

IterTuple(SEALIter first, IterTuple<Rest...> rest) : first_(first), rest_(rest){};
IterTuple(SEALIter first, IterTuple<Rest...> rest) : first_(first), rest_(rest)
{}

IterTuple(SEALIter first, Rest... rest) : first_(first), rest_(rest...)
{}
Expand Down Expand Up @@ -2061,7 +2062,8 @@ namespace seal
using iterator_category = std::random_access_iterator_tag;
using difference_type = std::ptrdiff_t;

IterTuple(){};
IterTuple()
{}

IterTuple(SEALIter first) : first_(first)
{}
Expand Down
6 changes: 4 additions & 2 deletions native/src/seal/util/mempool.h
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,8 @@ namespace seal
class MemoryPoolMT : public MemoryPool
{
public:
MemoryPoolMT(bool clear_on_destruction = false) : clear_on_destruction_(clear_on_destruction){};
MemoryPoolMT(bool clear_on_destruction = false) : clear_on_destruction_(clear_on_destruction)
{}

~MemoryPoolMT() noexcept override;

Expand Down Expand Up @@ -257,7 +258,8 @@ namespace seal
class MemoryPoolST : public MemoryPool
{
public:
MemoryPoolST(bool clear_on_destruction = false) : clear_on_destruction_(clear_on_destruction){};
MemoryPoolST(bool clear_on_destruction = false) : clear_on_destruction_(clear_on_destruction)
{}

~MemoryPoolST() noexcept override;

Expand Down

0 comments on commit 1a5676d

Please sign in to comment.