Use modern techniques to delete copy constructors and assignment operators

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

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* );
 

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;
 

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;

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

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

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);
 

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);

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);
 

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);

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

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);

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);

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);
 

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);
 

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;