Skip to content

Commit 01ca82c

Browse files
leekilloughKenneth Griesser
authored andcommitted
Use std::unique_ptr for modelGen (sstsimulator#1230)
1 parent 2d5c8f0 commit 01ca82c

File tree

1 file changed

+3
-10
lines changed

1 file changed

+3
-10
lines changed

src/sst/core/main.cc

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -293,9 +293,8 @@ start_graph_creation(
293293
}
294294
}
295295

296-
297296
// Create the model generator
298-
SSTModelDescription* modelGen = nullptr;
297+
std::unique_ptr<SSTModelDescription> modelGen;
299298

300299
force_rank_sequential_start(cfg.rank_seq_startup(), myRank, world_size);
301300

@@ -320,8 +319,8 @@ start_graph_creation(
320319
}
321320

322321
if ( myRank.rank == 0 || cfg.parallel_load() ) {
323-
modelGen = factory->Create<SSTModelDescription>(
324-
model_name, cfg.configFile(), cfg.verbose(), &cfg, sst_get_cpu_time());
322+
modelGen.reset(factory->Create<SSTModelDescription>(
323+
model_name, cfg.configFile(), cfg.verbose(), &cfg, sst_get_cpu_time()));
325324
}
326325
}
327326

@@ -357,12 +356,6 @@ start_graph_creation(
357356
}
358357
#endif
359358

360-
// Delete the model generator
361-
if ( modelGen ) {
362-
delete modelGen;
363-
modelGen = nullptr;
364-
}
365-
366359
return start_graph_gen;
367360
}
368361

0 commit comments

Comments
 (0)