Changes in src/periodentafel.cpp [f34c23:274d45]

File:

• src/periodentafel.cpp (modified) (2 diffs)

src/periodentafel.cpp

@@ -32 +32 @@
 periodentafel::periodentafel()
 {
-  {
-    stringstream input(elementsDB,ios_base::in);
-    bool status = LoadElementsDatabase(&input);
-    ASSERT(status,  "General element initialization failed");
-  }
-  {
-    stringstream input(valenceDB,ios_base::in);
-    bool status = LoadValenceDatabase(&input);
-    ASSERT(status, "Valence entry of element initialization failed");
-  }
-  {
-    stringstream input(orbitalsDB,ios_base::in);
-    bool status = LoadOrbitalsDatabase(&input);
-    ASSERT(status, "Orbitals entry of element initialization failed");
-  }
-  {
-    stringstream input(HbondangleDB,ios_base::in);
-    bool status = LoadHBondAngleDatabase(&input);
-    ASSERT(status, "HBond angle entry of element initialization failed");
-  }
-  {
-    stringstream input(HbonddistanceDB,ios_base::in);
-    bool status = LoadHBondLengthsDatabase(&input);
-    ASSERT(status, "HBond distance entry of element initialization failed");
-  }
+  bool status = true;
+  status = LoadElementsDatabase(new stringstream(elementsDB,ios_base::in));
+  ASSERT(status,  "General element initialization failed");
+  status = LoadValenceDatabase(new stringstream(valenceDB,ios_base::in));
+  ASSERT(status, "Valence entry of element initialization failed");
+  status = LoadOrbitalsDatabase(new stringstream(orbitalsDB,ios_base::in));
+  ASSERT(status, "Orbitals entry of element initialization failed");
+  status = LoadHBondAngleDatabase(new stringstream(HbondangleDB,ios_base::in));
+  ASSERT(status, "HBond angle entry of element initialization failed");
+  status = LoadHBondLengthsDatabase(new stringstream(HbonddistanceDB,ios_base::in));
+  ASSERT(status, "HBond distance entry of element initialization failed");
 };
 
@@ -347 +333 @@
           ASSERT(Elemental != NULL, "element should be present but is not??");
           *Elemental = *neues;
-          delete(neues);
-          neues = Elemental;
         } else {
           InserterTest = elements.insert(pair <atomicNumber_t,element*> (neues->getNumber(), neues));