LoopControl: Use C++ constructure to initialize lc_descr_t

1 files changed, 6 insertions, 9 deletions

diff --git a/Carpet/LoopControl/src/loopcontrol.cc b/Carpet/LoopControl/src/loopcontrol.cc
index 79ed2018c..518f5e86c 100644
--- a/Carpet/LoopControl/src/loopcontrol.cc
+++ b/Carpet/LoopControl/src/loopcontrol.cc
@@ -202,6 +202,11 @@ struct lc_descr_t {
   string file;
   int line;
   
+  lc_descr_t(const char *name_, const char *file_, int line_):
+    name(name_), file(file_), line(line_),
+    current_setup(0), current_params(0)
+  {}
+  
   typedef map<lc_setup_key_t, lc_setup_t*> setup_map_t;
   setup_map_t setups;
   
@@ -554,15 +559,7 @@ void lc_descr_init(lc_descr_t **const descr_ptr,
 #pragma omp barrier
 #pragma omp master
   {
-    lc_descr_t *const descr = new lc_descr_t;
-    
-    descr->name = name;
-    descr->file = file;
-    descr->line = line;
-    
-    descr->current_setup = NULL;
-    descr->current_params = NULL;
-    
+    lc_descr_t *const descr = new lc_descr_t(name, file, line);
     all_descrs.push_back(descr);
     *descr_ptr = descr;
   }