Merge pull request #1234 from sstsimulator/devel

Automatically Merged using SST Master Branch Merger

Author: sst-autotester

src/sst/core/main.cc

@@ -293,9 +293,8 @@ start_graph_creation(
         }
     }
 
-
     // Create the model generator
-    SSTModelDescription* modelGen = nullptr;
+    std::unique_ptr<SSTModelDescription> modelGen;
 
     force_rank_sequential_start(cfg.rank_seq_startup(), myRank, world_size);
 
@@ -320,8 +319,8 @@ start_graph_creation(
         }
 
         if ( myRank.rank == 0 || cfg.parallel_load() ) {
-            modelGen = factory->Create<SSTModelDescription>(
-                model_name, cfg.configFile(), cfg.verbose(), &cfg, sst_get_cpu_time());
+            modelGen.reset(factory->Create<SSTModelDescription>(
+                model_name, cfg.configFile(), cfg.verbose(), &cfg, sst_get_cpu_time()));
         }
     }
 
@@ -357,12 +356,6 @@ start_graph_creation(
     }
 #endif
 
-    // Delete the model generator
-    if ( modelGen ) {
-        delete modelGen;
-        modelGen = nullptr;
-    }
-
     return start_graph_gen;
 }
 

src/sst/core/statapi/statnull.h

@@ -51,7 +51,7 @@ class NullStatisticBase<T, true> : public Statistic<T>
 
     void addData_impl_Ntimes(uint64_t UNUSED(N), T UNUSED(data)) override {}
 
-    virtual const std::string& getStatTypeName() const { return stat_type_; }
+    virtual const std::string& getStatTypeName() const override { return stat_type_; }
 
 private:
     inline static const std::string stat_type_ = "NULL";
@@ -70,7 +70,7 @@ class NullStatisticBase<std::tuple<Args...>, false> : public Statistic<std::tupl
 
     void addData_impl_Ntimes(uint64_t UNUSED(N), Args... UNUSED(data)) override {}
 
-    virtual const std::string& getStatTypeName() const { return stat_type_; }
+    virtual const std::string& getStatTypeName() const override { return stat_type_; }
 
 private:
     inline static const std::string stat_type_ = "NULL";
@@ -91,7 +91,7 @@ class NullStatisticBase<T, false> : public Statistic<T>
     void addData_impl_Ntimes(uint64_t UNUSED(N), T&& UNUSED(data)) override {}
     void addData_impl_Ntimes(uint64_t UNUSED(N), const T& UNUSED(data)) override {}
 
-    virtual const std::string& getStatTypeName() const { return stat_type_; }
+    virtual const std::string& getStatTypeName() const override { return stat_type_; }
 
 private:
     inline static const std::string stat_type_ = "NULL";
@@ -164,7 +164,7 @@ class NullStatistic<void> : public Statistic<void>
 
     virtual std::string getELIName() const override { return "sst.NullStatistic"; }
 
-    virtual const std::string& getStatTypeName() const { return stat_type_; }
+    virtual const std::string& getStatTypeName() const override { return stat_type_; }
 
 private:
     inline static const std::string stat_type_ = "NULL";