Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
# Enable warnings for non-virtual destructors and missing overrides; add override and virtual destructors to remove warnings
f150d6f7db2d71f4a77720ee7e7a7385a57bf540

# Initial cmake-format fixes
1c149870b806f5412c34c918cea96caa14720f3c
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ esac

SST_CHECK_PICKY
AS_IF([test "x$use_picky" = "xyes"],
[WARNFLAGS="-Wall -Wextra -Wvla"],
[WARNFLAGS="-Wall -Wextra -Wvla -Wnon-virtual-dtor -Wsuggest-override"],
[WARNFLAGS=""])
CFLAGS="$CFLAGS $WARNFLAGS"
CXXFLAGS="$CXXFLAGS $WARNFLAGS"
Expand Down
10 changes: 8 additions & 2 deletions src/sst/core/impl/timevortex/timeVortexPQ.cc
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,10 @@ class TimeVortexPQ : public TimeVortexPQBase<false>
TimeVortexPQ() : TimeVortexPQBase<false>() {} // For serialization only
~TimeVortexPQ() {}

void serialize_order(SST::Core::Serialization::serializer& ser) { TimeVortexPQBase<false>::serialize_order(ser); }
void serialize_order(SST::Core::Serialization::serializer& ser) override
{
TimeVortexPQBase<false>::serialize_order(ser);
}

SST_ELI_EXPORT(TimeVortexPQ)
};
Expand All @@ -175,7 +178,10 @@ class TimeVortexPQ_ts : public TimeVortexPQBase<true>
TimeVortexPQ_ts() : TimeVortexPQBase<true>() {} // For serialization only
~TimeVortexPQ_ts() {}

void serialize_order(SST::Core::Serialization::serializer& ser) { TimeVortexPQBase<true>::serialize_order(ser); }
void serialize_order(SST::Core::Serialization::serializer& ser) override
{
TimeVortexPQBase<true>::serialize_order(ser);
}

SST_ELI_EXPORT(TimeVortexPQ_ts)
};
Expand Down
5 changes: 4 additions & 1 deletion src/sst/core/interfaces/stdMem.h
Original file line number Diff line number Diff line change
Expand Up @@ -1523,7 +1523,10 @@ class StandardMem : public SubComponent
/**
* Serialization function
*/
virtual void serialize_order(SST::Core::Serialization::serializer& ser) { SST::SubComponent::serialize_order(ser); }
void serialize_order(SST::Core::Serialization::serializer& ser) override
{
SST::SubComponent::serialize_order(ser);
}
};

} // namespace SST::Interfaces
Expand Down
4 changes: 2 additions & 2 deletions src/sst/core/testElements/coreTest_ClockerComponent.h
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ class coreTestClockerComponent : public SST::Component
)

coreTestClockerComponent(SST::ComponentId_t id, SST::Params& params);
void setup() {}
void finish() {}
void setup() override {}
void finish() override {}

private:
coreTestClockerComponent(); // for serialization only
Expand Down
4 changes: 2 additions & 2 deletions src/sst/core/testElements/coreTest_DistribComponent.h
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ class coreTestDistribComponent : public SST::Component
)

coreTestDistribComponent(SST::ComponentId_t id, SST::Params& params);
void finish();
void setup() {}
void finish() override;
void setup() override {}

private:
coreTestDistribComponent(); // for serialization only
Expand Down
4 changes: 2 additions & 2 deletions src/sst/core/testElements/coreTest_Links.h
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ class coreTestLinks : public SST::Component
coreTestLinks(SST::ComponentId_t id, SST::Params& params);
~coreTestLinks() = default;

void setup() {}
void finish() {}
void setup() override {}
void finish() override {}

private:
int my_id;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ class coreTestMessageGeneratorComponent : public SST::Component
)

coreTestMessageGeneratorComponent(SST::ComponentId_t id, SST::Params& params);
void setup() {}
void finish()
void setup() override {}
void finish() override
{
fprintf(stdout, "Component completed at: %" PRIu64 " milliseconds\n", (uint64_t)getCurrentSimTimeMilli());
}
Expand Down
4 changes: 2 additions & 2 deletions src/sst/core/testElements/coreTest_ParamComponent.h
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ class coreTestParamComponent : public SST::Component

coreTestParamComponent(SST::ComponentId_t id, SST::Params& params);
~coreTestParamComponent() {}
void setup() {}
void finish() {}
void setup() override {}
void finish() override {}

private:
coreTestParamComponent(); // for serialization only
Expand Down
4 changes: 2 additions & 2 deletions src/sst/core/testElements/coreTest_PerfComponent.h
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,8 @@ class coreTestPerfComponent : public coreTestPerfComponentBase2
coreTestPerfComponent(SST::ComponentId_t id, SST::Params& params);
~coreTestPerfComponent();

void setup() {}
void finish() { printf("Perf Test Component Finished.\n"); }
void setup() override {}
void finish() override { printf("Perf Test Component Finished.\n"); }

private:
coreTestPerfComponent(); // for serialization only
Expand Down
4 changes: 2 additions & 2 deletions src/sst/core/testElements/coreTest_RNGComponent.h
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ class coreTestRNGComponent : public SST::Component

coreTestRNGComponent(SST::ComponentId_t id, SST::Params& params);
~coreTestRNGComponent();
void setup() {}
void finish() {}
void setup() override {}
void finish() override {}

private:
coreTestRNGComponent(); // for serialization only
Expand Down
8 changes: 4 additions & 4 deletions src/sst/core/testElements/coreTest_StatisticsComponent.h
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ class StatisticsComponentInt : public SST::Component
)

StatisticsComponentInt(ComponentId_t id, Params& params);
void setup() {}
void finish() {}
void setup() override {}
void finish() override {}

private:
StatisticsComponentInt();
Expand Down Expand Up @@ -121,8 +121,8 @@ class StatisticsComponentFloat : public SST::Component
)

StatisticsComponentFloat(ComponentId_t id, Params& params);
void setup() {}
void finish() {}
void setup() override {}
void finish() override {}

private:
StatisticsComponentFloat();
Expand Down
6 changes: 3 additions & 3 deletions src/sst/core/testElements/message_mesh/enclosingComponent.h
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,8 @@ class EnclosingComponent : public SST::Component

EnclosingComponent(ComponentId_t id, Params& params);

void setup();
void finish();
void setup() override;
void finish() override;

private:
void handleEvent(SST::Event* ev, int port);
Expand Down Expand Up @@ -188,7 +188,7 @@ class MessagePort : public PortInterface
MessagePort(ComponentId_t id, Params& params);
~MessagePort() {}

void send(MessageEvent* ev);
void send(MessageEvent* ev) override;
void handleEvent(Event* ev);

private:
Expand Down
1 change: 1 addition & 0 deletions src/sst/core/watchPoint.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ class WatchPoint : public Clock::HandlerBase::AttachPoint, public Event::Handler
{
public:
virtual bool check() = 0;
virtual ~Logic() = default;
};

WatchPoint(const std::string& name, Core::Serialization::ObjectMapComparison* obj) :
Expand Down
Loading