Skip to content

Commit

Permalink
Fix up virtual destructors
Browse files Browse the repository at this point in the history
  • Loading branch information
eric-hughes-tiledb committed Sep 5, 2024
1 parent 3dc230b commit bf79617
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 10 deletions.
2 changes: 0 additions & 2 deletions tiledb/sm/consolidator/consolidator.cc
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,6 @@ Consolidator::Consolidator(JobParent& parent)
consolidator_memory_tracker_->set_type(MemoryTrackerType::CONSOLIDATOR);
}

Consolidator::~Consolidator() = default;

/* ****************************** */
/* API */
/* ****************************** */
Expand Down
12 changes: 5 additions & 7 deletions tiledb/sm/consolidator/consolidator.h
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,11 @@ class Consolidator : public JobBranch {
explicit Consolidator(JobParent& parent);

public:
/**
* Virtual destructor is override from `JobBranch`.
*/
~Consolidator() override = default;

/* ********************************* */
/* FACTORY METHODS */
/* ********************************* */
Expand All @@ -111,13 +116,6 @@ class Consolidator : public JobBranch {
static ConsolidationMode mode_from_config(
const Config& config, const bool vacuum_mode = false);

/* ********************************* */
/* DESTRUCTORS */
/* ********************************* */

/** Destructor. */
virtual ~Consolidator();

/* ********************************* */
/* API */
/* ********************************* */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,11 @@ class ArrayDimensionLabelQueries : public JobBranch {
/** Default constructor is not C.41 compliant. */
ArrayDimensionLabelQueries() = delete;

/**
* Virtual destructor is override from `JobBranch`.
*/
~ArrayDimensionLabelQueries() override = default;

/**
* Constructor.
*
Expand Down
2 changes: 1 addition & 1 deletion tiledb/sm/storage_manager/context.h
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ class Context : public ContextBase, public JobRoot {
explicit Context(const Config&);

/** Destructor. */
~Context() = default;
~Context() override = default;

/* ********************************* */
/* API */
Expand Down
2 changes: 2 additions & 0 deletions tiledb/sm/storage_manager/job.h
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,8 @@ struct JobResourceMixin {
, activity_(activity) {
}

virtual ~ParentMixin() = default;

/**
* Accessor for the resources of this Parent
*
Expand Down
2 changes: 2 additions & 0 deletions tiledb/sm/storage_manager/test/unit_job.cc
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,7 @@ class TestJobRoot : protected TestJobRootBase, public JobRoot {
TestJobRoot()
: TestJobRootBase(), JobRoot(Base::sm_) {
}
~TestJobRoot() override = default;
ContextResources& resources() const override {
return Base::resources_;
}
Expand All @@ -264,6 +265,7 @@ class TestJobBranch : public JobBranch {
TestJobBranch(JobParent& parent)
: JobBranch(parent) {
}
~TestJobBranch() override = default;
ContextResources& resources() const override {
return parent().resources();
}
Expand Down

0 comments on commit bf79617

Please sign in to comment.