Resolve "cleanup: c++ header files"

src/Classic/Fields/FM3DH5Block.cpp

@@ -5,8 +5,7 @@
 
 #include <fstream>
 #include <ios>
-
-#include <assert.h>
+#include <cassert>
 
 
 FM3DH5Block::FM3DH5Block(std::string aFilename):Fieldmap(aFilename) {

src/Classic/Fields/FM3DH5Block_nonscale.cpp

@@ -6,8 +6,7 @@
 #include <cmath>
 #include <fstream>
 #include <ios>
-
-#include <assert.h>
+#include <cassert>
 
 
 FM3DH5Block_nonscale::FM3DH5Block_nonscale(std::string aFilename):

src/Classic/Fields/FM3DMagnetoStaticH5Block.cpp

@@ -6,8 +6,7 @@
 #include <cmath>
 #include <fstream>
 #include <ios>
-
-#include <assert.h>
+#include <cassert>
 
 
 FM3DMagnetoStaticH5Block::FM3DMagnetoStaticH5Block(std::string aFilename):

src/Classic/Fields/Fieldmap.cpp

@@ -36,8 +36,7 @@
 #include <iostream>
 #include <fstream>
 #include <ios>
-
-#include <assert.h>
+#include <cassert>
 
 namespace fs = boost::filesystem;
 

src/Optimize/OpalSimulation.cpp

 #include <iostream>
 #include <sstream>
-#include <string.h>
+#include <cstring>
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/wait.h>

src/Sample/Sampler.h

@@ -22,10 +22,9 @@
 #ifndef __OPAL_SAMPLER_H__
 #define __OPAL_SAMPLER_H__
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <time.h>
-
+#include <cstdio>
+#include <cstdlib>
+#include <ctime>
 #include <string>
 #include <sstream>
 #include <vector>
@@ -33,6 +32,8 @@
 #include <utility>
 #include <fstream>
 #include <list>
+#include <memory>
+#include <queue>
 
 #include "Comm/types.h"
 #include "Util/Types.h"
@@ -44,11 +45,6 @@
 
 #include <boost/smart_ptr.hpp>
 #include <boost/chrono.hpp>
-
-#include <memory>
-
-#include <queue>
-
 #include <boost/property_tree/ptree.hpp>
 
 

src/Solvers/ArbitraryDomain.cpp

@@ -31,7 +31,7 @@
 #include <cmath>
 #include <iostream>
 #include <tuple>
-#include <assert.h>
+#include <cassert>
 
 ArbitraryDomain::ArbitraryDomain( BoundaryGeometry * bgeom,
                                   Vector_t nr,

src/Solvers/BoxCornerDomain.cpp

@@ -26,7 +26,7 @@
 #include <string>
 #include <cmath>
 #include <iostream>
-#include <assert.h>
+#include <cassert>
 
 //FIXME: ORDER HOW TO TRAVERSE NODES IS FIXED, THIS SHOULD BE MORE GENERIC! (PLACES MARKED)
 

src/Solvers/EllipticDomain.cpp

@@ -25,7 +25,7 @@
 #include <map>
 #include <cmath>
 #include <iostream>
-#include <assert.h>
+#include <cassert>
 
 //FIXME: ORDER HOW TO TRAVERSE NODES IS FIXED, THIS SHOULD BE MORE GENERIC! (PLACES MARKED)
 

src/Structure/BoundaryGeometry.h

@@ -22,7 +22,7 @@
 class OpalBeamline;
 class ElementBase;
 
-#include <assert.h>
+#include <cassert>
 #include <unordered_map>
 #include <unordered_set>
 #include <array>