From f39a8d46d19a15a6735c319b0190b7f3ce416e3c Mon Sep 17 00:00:00 2001
From: Axel Kohlmeyer <akohlmey@gmail.com>
Date: Tue, 8 May 2018 00:05:18 -0400
Subject: [PATCH] convert atc library header files to C++ style
---
lib/atc/Array.h | 2 +-
lib/atc/Array2D.h | 3 +--
lib/atc/ElectronPhononExchange.cpp | 2 +-
lib/atc/FE_Element.cpp | 2 +-
lib/atc/FE_Engine.cpp | 4 ++--
lib/atc/FE_Interpolate.cpp | 2 +-
lib/atc/FE_Mesh.cpp | 2 +-
lib/atc/FE_Mesh.h | 2 +-
lib/atc/Function.h | 2 +-
lib/atc/GMRES.h | 2 +-
lib/atc/KD_Tree.cpp | 2 +-
lib/atc/KD_Tree.h | 2 +-
lib/atc/KernelFunction.cpp | 2 +-
lib/atc/LammpsInterface.h | 2 +-
lib/atc/OutputManager.cpp | 2 +-
lib/atc/ShapeFunction.h | 8 ++++----
lib/atc/Utility.h | 2 +-
17 files changed, 21 insertions(+), 22 deletions(-)
diff --git a/lib/atc/Array.h b/lib/atc/Array.h
index 9df6cbbda2..21e66a9551 100644
--- a/lib/atc/Array.h
+++ b/lib/atc/Array.h
@@ -4,7 +4,7 @@
#include <cstdlib>
#include <iostream>
#include <string>
-#include <stdio.h>
+#include <cstdio>
// for macros
#include "MatrixDef.h"
diff --git a/lib/atc/Array2D.h b/lib/atc/Array2D.h
index 8d3af47e12..25f895f72c 100644
--- a/lib/atc/Array2D.h
+++ b/lib/atc/Array2D.h
@@ -2,10 +2,9 @@
#define ARRAY2D_H
#include <cstdlib>
+#include <cstdio>
#include <string>
#include <iostream>
-#include <cstdlib>
-#include <stdio.h>
#include "Array.h"
diff --git a/lib/atc/ElectronPhononExchange.cpp b/lib/atc/ElectronPhononExchange.cpp
index 2ed25fc557..0ccc8ec67e 100644
--- a/lib/atc/ElectronPhononExchange.cpp
+++ b/lib/atc/ElectronPhononExchange.cpp
@@ -5,7 +5,7 @@
#include <iostream>
#include <vector>
-#include <math.h>
+#include <cmath>
using ATC_Utility::command_line;
using ATC_Utility::str2dbl;
diff --git a/lib/atc/FE_Element.cpp b/lib/atc/FE_Element.cpp
index cfc59aa601..9eec08c483 100644
--- a/lib/atc/FE_Element.cpp
+++ b/lib/atc/FE_Element.cpp
@@ -8,7 +8,7 @@
#include "Utility.h"
// Other headers
-#include "math.h"
+#include <cmath>
using ATC_Utility::dbl_geq;
using ATC_Utility::det3;
diff --git a/lib/atc/FE_Engine.cpp b/lib/atc/FE_Engine.cpp
index 0e94dfa031..efcde66d78 100644
--- a/lib/atc/FE_Engine.cpp
+++ b/lib/atc/FE_Engine.cpp
@@ -7,8 +7,8 @@
#include "KernelFunction.h"
#include "Utility.h"
#include "MPI_Wrappers.h"
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
#include <map>
#include <string>
diff --git a/lib/atc/FE_Interpolate.cpp b/lib/atc/FE_Interpolate.cpp
index 3f41e30029..19753a8007 100644
--- a/lib/atc/FE_Interpolate.cpp
+++ b/lib/atc/FE_Interpolate.cpp
@@ -5,7 +5,7 @@
#include "FE_Quadrature.h"
// Other headers
-#include "math.h"
+#include <cmath>
using std::map;
using std::vector;
diff --git a/lib/atc/FE_Mesh.cpp b/lib/atc/FE_Mesh.cpp
index 6225a1b192..b090bf2881 100644
--- a/lib/atc/FE_Mesh.cpp
+++ b/lib/atc/FE_Mesh.cpp
@@ -6,7 +6,7 @@
#include "OutputManager.h"
#include "Utility.h"
#include <sstream>
-#include <assert.h>
+#include <cassert>
#include <algorithm>
#include <cmath>
#include <functional>
diff --git a/lib/atc/FE_Mesh.h b/lib/atc/FE_Mesh.h
index b37cb1e8ba..be40d7cb28 100644
--- a/lib/atc/FE_Mesh.h
+++ b/lib/atc/FE_Mesh.h
@@ -12,7 +12,7 @@
#include <map>
#include <set>
#include <utility>
-#include <float.h>
+#include <cfloat>
#include <string>
#include <vector>
#include "mpi.h"
diff --git a/lib/atc/Function.h b/lib/atc/Function.h
index 7368589e96..4572009f92 100644
--- a/lib/atc/Function.h
+++ b/lib/atc/Function.h
@@ -1,7 +1,7 @@
#ifndef XT_FUNCTION_H
#define XT_FUNCTION_H
-#include <math.h>
+#include <cmath>
#include <string>
#include <set>
#include <cstdlib>
diff --git a/lib/atc/GMRES.h b/lib/atc/GMRES.h
index 0cffe9837f..a64fc70c00 100644
--- a/lib/atc/GMRES.h
+++ b/lib/atc/GMRES.h
@@ -19,7 +19,7 @@
//
//*****************************************************************
-#include <math.h>
+#include <cmath>
template<class Real>
diff --git a/lib/atc/KD_Tree.cpp b/lib/atc/KD_Tree.cpp
index 362bd70d34..1432663e80 100644
--- a/lib/atc/KD_Tree.cpp
+++ b/lib/atc/KD_Tree.cpp
@@ -1,5 +1,5 @@
#include "KD_Tree.h"
-#include <assert.h>
+#include <cassert>
using std::vector;
diff --git a/lib/atc/KD_Tree.h b/lib/atc/KD_Tree.h
index 6c788c4071..3877cd4099 100644
--- a/lib/atc/KD_Tree.h
+++ b/lib/atc/KD_Tree.h
@@ -4,7 +4,7 @@
#include "Array2D.h"
#include "MatrixDef.h"
#include "MatrixLibrary.h"
-#include <math.h>
+#include <cmath>
#include <vector>
#include <utility>
diff --git a/lib/atc/KernelFunction.cpp b/lib/atc/KernelFunction.cpp
index 91f99a6149..80e41a1550 100644
--- a/lib/atc/KernelFunction.cpp
+++ b/lib/atc/KernelFunction.cpp
@@ -1,5 +1,5 @@
#include "KernelFunction.h"
-#include "math.h"
+#include <cmath>
#include <vector>
#include "ATC_Error.h"
#include "Quadrature.h"
diff --git a/lib/atc/LammpsInterface.h b/lib/atc/LammpsInterface.h
index 2c78269522..2032571da5 100644
--- a/lib/atc/LammpsInterface.h
+++ b/lib/atc/LammpsInterface.h
@@ -2,7 +2,7 @@
#define LAMMPS_INTERFACE_H
#include <iostream>
-#include <stdlib.h>
+#include <cstdlib>
#include <map>
#include <iostream>
#include <string>
diff --git a/lib/atc/OutputManager.cpp b/lib/atc/OutputManager.cpp
index 414c5173e7..4340c8b8b0 100644
--- a/lib/atc/OutputManager.cpp
+++ b/lib/atc/OutputManager.cpp
@@ -1,6 +1,6 @@
#include <string>
#include <fstream>
-#include <stdio.h>
+#include <cstdio>
#include <sstream>
#include "OutputManager.h"
#include "ATC_Error.h"
diff --git a/lib/atc/ShapeFunction.h b/lib/atc/ShapeFunction.h
index 724e66924f..62b2138cd7 100644
--- a/lib/atc/ShapeFunction.h
+++ b/lib/atc/ShapeFunction.h
@@ -5,10 +5,10 @@
#include "DependencyManager.h"
#include "PaqAtcUtility.h"
-#include <map.h>
-#include <vector.h>
-#include <set.h>
-#include <pair.h>
+#include <map>
+#include <vector>
+#include <set>
+#include <pair>
namespace ATC {
diff --git a/lib/atc/Utility.h b/lib/atc/Utility.h
index f9e99ff194..d975d4804a 100644
--- a/lib/atc/Utility.h
+++ b/lib/atc/Utility.h
@@ -13,7 +13,7 @@
#include <sstream>
#include <iomanip>
#include <algorithm>
-#include "math.h"
+#include <cmath>
#include "ATC_Error.h"
--
GitLab