diff --git a/src/sst/core/checkpointAction.h b/src/sst/core/checkpointAction.h index 7a4eaf15f..7ae922a1d 100644 --- a/src/sst/core/checkpointAction.h +++ b/src/sst/core/checkpointAction.h @@ -84,10 +84,9 @@ class CheckpointAction : public Action NotSerializable(SST::CheckpointAction); private: - CheckpointAction() {} - CheckpointAction(const CheckpointAction&); + CheckpointAction(const CheckpointAction&) = delete; + CheckpointAction& operator=(const CheckpointAction&) = delete; - void operator=(CheckpointAction const&); void createCheckpoint(Simulation_impl* sim); // The actual checkpoint operation RankInfo rank_; // RankInfo for this thread/rank diff --git a/src/sst/core/exit.h b/src/sst/core/exit.h index b5b04efa3..0a95fc9b1 100644 --- a/src/sst/core/exit.h +++ b/src/sst/core/exit.h @@ -98,9 +98,9 @@ class Exit : public Action void serialize_order(SST::Core::Serialization::serializer& ser) override; ImplementSerializable(SST::Exit) private: - Exit() {} // for serialization only - Exit(const Exit&); // Don't implement - void operator=(Exit const&); // Don't implement + Exit() = default; // for serialization only + Exit(const Exit&) = delete; // Don't implement + Exit& operator=(const Exit&) = delete; // Don't implement // bool handler( Event* ); diff --git a/src/sst/core/factory.h b/src/sst/core/factory.h index a5bfcb091..429cf93b0 100644 --- a/src/sst/core/factory.h +++ b/src/sst/core/factory.h @@ -314,9 +314,8 @@ class Factory Factory(const std::string& searchPaths); ~Factory(); - Factory(); // Don't Implement - Factory(Factory const&); // Don't Implement - void operator=(Factory const&); // Don't Implement + Factory(const Factory&) = delete; // Don't Implement + Factory& operator=(const Factory&) = delete; // Don't Implement static Factory* instance; diff --git a/src/sst/core/heartbeat.h b/src/sst/core/heartbeat.h index a0824f4ef..ba5b1d6a5 100644 --- a/src/sst/core/heartbeat.h +++ b/src/sst/core/heartbeat.h @@ -45,10 +45,10 @@ class SimulatorHeartbeat : public Action ImplementSerializable(SST::SimulatorHeartbeat) private: - SimulatorHeartbeat() {}; - SimulatorHeartbeat(const SimulatorHeartbeat&); + SimulatorHeartbeat() = default; + SimulatorHeartbeat(const SimulatorHeartbeat&) = delete; + SimulatorHeartbeat& operator=(const SimulatorHeartbeat&) = delete; - void operator=(SimulatorHeartbeat const&); void execute() override; int rank; TimeConverter* m_period; diff --git a/src/sst/core/interactiveConsole.h b/src/sst/core/interactiveConsole.h index 1523a1431..f1a743a0b 100644 --- a/src/sst/core/interactiveConsole.h +++ b/src/sst/core/interactiveConsole.h @@ -123,9 +123,8 @@ class InteractiveConsole SST::Core::Serialization::ObjectMap* getComponentObjectMap(); private: - InteractiveConsole(const InteractiveConsole&); - - void operator=(InteractiveConsole const&); + InteractiveConsole(const InteractiveConsole&) = delete; + InteractiveConsole& operator=(const InteractiveConsole&) = delete; }; } // namespace SST diff --git a/src/sst/core/simulation_impl.h b/src/sst/core/simulation_impl.h index 5670040e2..4ea88a72a 100644 --- a/src/sst/core/simulation_impl.h +++ b/src/sst/core/simulation_impl.h @@ -332,10 +332,9 @@ class Simulation_impl // To enable main to set up globals friend int ::main(int argc, char** argv); - Simulation_impl() {} Simulation_impl(Config* config, RankInfo my_rank, RankInfo num_ranks, bool restart); - Simulation_impl(Simulation_impl const&); // Don't Implement - void operator=(Simulation_impl const&); // Don't implement + Simulation_impl(const Simulation_impl&) = delete; // Don't Implement + Simulation_impl& operator=(const Simulation_impl&) = delete; // Don't implement /** Get a handle to a TimeConverter * @param cycles Frequency which is the base of the TimeConverter diff --git a/src/sst/core/testElements/coreTest_ClockerComponent.h b/src/sst/core/testElements/coreTest_ClockerComponent.h index a49376850..185442870 100644 --- a/src/sst/core/testElements/coreTest_ClockerComponent.h +++ b/src/sst/core/testElements/coreTest_ClockerComponent.h @@ -51,9 +51,9 @@ class coreTestClockerComponent : public SST::Component void finish() {} private: - coreTestClockerComponent(); // for serialization only - coreTestClockerComponent(const coreTestClockerComponent&); // do not implement - void operator=(const coreTestClockerComponent&); // do not implement + coreTestClockerComponent(); // for serialization only + coreTestClockerComponent(const coreTestClockerComponent&) = delete; // do not implement + coreTestClockerComponent& operator=(const coreTestClockerComponent&) = delete; // do not implement virtual bool tick(SST::Cycle_t); diff --git a/src/sst/core/testElements/coreTest_Component.h b/src/sst/core/testElements/coreTest_Component.h index 5c623ee0b..f7ba2e4fb 100644 --- a/src/sst/core/testElements/coreTest_Component.h +++ b/src/sst/core/testElements/coreTest_Component.h @@ -123,8 +123,8 @@ class coreTestComponent : public coreTestComponentBase2 coreTestComponent(); // for serialization only private: - coreTestComponent(const coreTestComponent&); // do not implement - void operator=(const coreTestComponent&); // do not implement + coreTestComponent(const coreTestComponent&) = delete; // do not implement + coreTestComponent& operator=(const coreTestComponent&) = delete; // do not implement void handleEvent(SST::Event* ev); virtual bool clockTic(SST::Cycle_t); diff --git a/src/sst/core/testElements/coreTest_DistribComponent.h b/src/sst/core/testElements/coreTest_DistribComponent.h index 17d260a23..c0bc8ecdb 100644 --- a/src/sst/core/testElements/coreTest_DistribComponent.h +++ b/src/sst/core/testElements/coreTest_DistribComponent.h @@ -61,9 +61,9 @@ class coreTestDistribComponent : public SST::Component void setup() {} private: - coreTestDistribComponent(); // for serialization only - coreTestDistribComponent(const coreTestDistribComponent&); // do not implement - void operator=(const coreTestDistribComponent&); // do not implement + coreTestDistribComponent(); // for serialization only + coreTestDistribComponent(const coreTestDistribComponent&) = delete; // do not implement + coreTestDistribComponent& operator=(const coreTestDistribComponent&) = delete; // do not implement virtual bool tick(SST::Cycle_t); diff --git a/src/sst/core/testElements/coreTest_MessageGeneratorComponent.h b/src/sst/core/testElements/coreTest_MessageGeneratorComponent.h index dbea707bb..21f5c4ec0 100644 --- a/src/sst/core/testElements/coreTest_MessageGeneratorComponent.h +++ b/src/sst/core/testElements/coreTest_MessageGeneratorComponent.h @@ -57,9 +57,9 @@ class coreTestMessageGeneratorComponent : public SST::Component } private: - coreTestMessageGeneratorComponent(); // for serialization only - coreTestMessageGeneratorComponent(const coreTestMessageGeneratorComponent&); // do not implement - void operator=(const coreTestMessageGeneratorComponent&); // do not implement + coreTestMessageGeneratorComponent(); // for serialization only + coreTestMessageGeneratorComponent(const coreTestMessageGeneratorComponent&) = delete; // do not implement + coreTestMessageGeneratorComponent& operator=(const coreTestMessageGeneratorComponent&) = delete; // do not implement void handleEvent(SST::Event* ev); virtual bool tick(SST::Cycle_t); diff --git a/src/sst/core/testElements/coreTest_ParamComponent.h b/src/sst/core/testElements/coreTest_ParamComponent.h index d0d23f026..4a4ff7e09 100644 --- a/src/sst/core/testElements/coreTest_ParamComponent.h +++ b/src/sst/core/testElements/coreTest_ParamComponent.h @@ -62,9 +62,9 @@ class coreTestParamComponent : public SST::Component void finish() {} private: - coreTestParamComponent(); // for serialization only - coreTestParamComponent(const coreTestParamComponent&); // do not implement - void operator=(const coreTestParamComponent&); // do not implement + coreTestParamComponent(); // for serialization only + coreTestParamComponent(const coreTestParamComponent&) = delete; // do not implement + coreTestParamComponent& operator=(const coreTestParamComponent&) = delete; // do not implement }; } // namespace SST::CoreTestParamComponent diff --git a/src/sst/core/testElements/coreTest_PerfComponent.h b/src/sst/core/testElements/coreTest_PerfComponent.h index 07f9bcb10..42d0e733b 100644 --- a/src/sst/core/testElements/coreTest_PerfComponent.h +++ b/src/sst/core/testElements/coreTest_PerfComponent.h @@ -103,9 +103,9 @@ class coreTestPerfComponent : public coreTestPerfComponentBase2 void finish() { printf("Perf Test Component Finished.\n"); } private: - coreTestPerfComponent(); // for serialization only - coreTestPerfComponent(const coreTestPerfComponent&); // do not implement - void operator=(const coreTestPerfComponent&); // do not implement + coreTestPerfComponent(); // for serialization only + coreTestPerfComponent(const coreTestPerfComponent&) = delete; // do not implement + coreTestPerfComponent& operator=(const coreTestPerfComponent&) = delete; // do not implement void handleEvent(SST::Event* ev); virtual bool clockTic(SST::Cycle_t); diff --git a/src/sst/core/testElements/coreTest_PortModule.h b/src/sst/core/testElements/coreTest_PortModule.h index 3d9124730..93c199822 100644 --- a/src/sst/core/testElements/coreTest_PortModule.h +++ b/src/sst/core/testElements/coreTest_PortModule.h @@ -148,9 +148,9 @@ class coreTestPortModuleComponent : public SST::Component PortSubComponent* sub_ = nullptr; - coreTestPortModuleComponent() {} // for serialization only - coreTestPortModuleComponent(const coreTestPortModuleComponent&); // do not implement - void operator=(const coreTestPortModuleComponent&); // do not implement + coreTestPortModuleComponent() = default; // for serialization only + coreTestPortModuleComponent(const coreTestPortModuleComponent&) = delete; // do not implement + coreTestPortModuleComponent& operator=(const coreTestPortModuleComponent&) = delete; // do not implement bool tick(SST::Cycle_t); void handleEvent(SST::Event* ev); diff --git a/src/sst/core/testElements/coreTest_RNGComponent.h b/src/sst/core/testElements/coreTest_RNGComponent.h index ffc0a3b51..40a2fd200 100644 --- a/src/sst/core/testElements/coreTest_RNGComponent.h +++ b/src/sst/core/testElements/coreTest_RNGComponent.h @@ -60,9 +60,9 @@ class coreTestRNGComponent : public SST::Component void finish() {} private: - coreTestRNGComponent(); // for serialization only - coreTestRNGComponent(const coreTestRNGComponent&); // do not implement - void operator=(const coreTestRNGComponent&); // do not implement + coreTestRNGComponent(); // for serialization only + coreTestRNGComponent(const coreTestRNGComponent&) = delete; // do not implement + coreTestRNGComponent& operator=(const coreTestRNGComponent&) = delete; // do not implement virtual bool tick(SST::Cycle_t); diff --git a/src/sst/core/testElements/coreTest_StatisticsComponent.h b/src/sst/core/testElements/coreTest_StatisticsComponent.h index 48d198c3a..ca26e565a 100644 --- a/src/sst/core/testElements/coreTest_StatisticsComponent.h +++ b/src/sst/core/testElements/coreTest_StatisticsComponent.h @@ -65,8 +65,8 @@ class StatisticsComponentInt : public SST::Component private: StatisticsComponentInt(); - StatisticsComponentInt(const StatisticsComponentInt&); // do not implement - void operator=(const StatisticsComponentInt&); // do not implement + StatisticsComponentInt(const StatisticsComponentInt&) = delete; // do not implement + StatisticsComponentInt& operator=(const StatisticsComponentInt&) = delete; // do not implement virtual bool Clock1Tick(SST::Cycle_t); @@ -126,8 +126,8 @@ class StatisticsComponentFloat : public SST::Component private: StatisticsComponentFloat(); - StatisticsComponentFloat(const StatisticsComponentFloat&); // do not implement - void operator=(const StatisticsComponentFloat&); // do not implement + StatisticsComponentFloat(const StatisticsComponentFloat&) = delete; // do not implement + void operator=(const StatisticsComponentFloat&) = delete; // do not implement virtual bool Clock1Tick(SST::Cycle_t); diff --git a/src/sst/core/timeLord.h b/src/sst/core/timeLord.h index 3d97709b0..20b5ec2d6 100644 --- a/src/sst/core/timeLord.h +++ b/src/sst/core/timeLord.h @@ -92,8 +92,8 @@ class TimeLord TimeLord() : initialized(false) {} ~TimeLord(); - TimeLord(TimeLord const&); // Don't Implement - void operator=(TimeLord const&); // Don't Implement + TimeLord(const TimeLord&) = delete; // Don't Implement + TimeLord& operator=(const TimeLord&) = delete; // Don't Implement bool initialized; std::recursive_mutex slock;