From de704473eba1c275114fca5d8882fec7986e279b Mon Sep 17 00:00:00 2001
From: Harry Moffat <hkmoffa@sandia.gov>
Date: Wed, 17 Dec 2008 17:09:37 +0000
Subject: [PATCH] Changed old to new style C headers

---
 Cantera/src/base/ct2ctml.cpp             |  2 +-
 Cantera/src/base/ctml.cpp                |  4 ++--
 Cantera/src/base/logger.h                |  4 +++-
 Cantera/src/base/stringUtils.cpp         |  8 ++++----
 Cantera/src/converters/CKParser.cpp      |  2 +-
 Cantera/src/converters/CKReader.cpp      |  8 ++++----
 Cantera/src/converters/writelog.cpp      |  2 +-
 Cantera/src/kinetics/GasKinetics.h       |  5 +++--
 Cantera/src/kinetics/GasKineticsWriter.h |  5 +++--
 Cantera/src/kinetics/InterfaceKinetics.h |  5 +++--
 Cantera/src/kinetics/solveSP.cpp         | 10 +++++-----
 11 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/Cantera/src/base/ct2ctml.cpp b/Cantera/src/base/ct2ctml.cpp
index a4cf53d76..a4877353a 100644
--- a/Cantera/src/base/ct2ctml.cpp
+++ b/Cantera/src/base/ct2ctml.cpp
@@ -22,7 +22,7 @@
 #include "ctexceptions.h"
 #include <fstream>
 #include <string>
-#include <stdlib.h>
+#include <cstdlib>
 #include <time.h>
 #include "ctml.h"
 
diff --git a/Cantera/src/base/ctml.cpp b/Cantera/src/base/ctml.cpp
index 78e0aecdd..dd5b56ae0 100755
--- a/Cantera/src/base/ctml.cpp
+++ b/Cantera/src/base/ctml.cpp
@@ -23,8 +23,8 @@
 
 #define CTML_VERSION_1_4_1
 
-#include <ctype.h>
-#include <string.h>
+#include <cctype>
+#include <cstring>
 
 using namespace std;
 using namespace Cantera;
diff --git a/Cantera/src/base/logger.h b/Cantera/src/base/logger.h
index 5597fa667..d4b508aa3 100644
--- a/Cantera/src/base/logger.h
+++ b/Cantera/src/base/logger.h
@@ -12,6 +12,8 @@
 
 #include <iostream>
 
+#include <cstdlib>
+
 namespace Cantera {
 
     ///
@@ -83,7 +85,7 @@ namespace Cantera {
        */
       virtual void error(const std::string& msg) {
 	std::cerr << msg << std::endl;
-	std::exit(-1);
+        exit(EXIT_FAILURE);
       }
 
       /// Return an integer specifying the application environment.
diff --git a/Cantera/src/base/stringUtils.cpp b/Cantera/src/base/stringUtils.cpp
index e1ef95c8b..bd63ac288 100755
--- a/Cantera/src/base/stringUtils.cpp
+++ b/Cantera/src/base/stringUtils.cpp
@@ -18,10 +18,10 @@
 
 #include "ct_defs.h"
 #include "ctexceptions.h"
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <ctype.h>
+#include <cstdio>
+#include <cstring>
+#include <cstdlib>
+#include <cctype>
 #include "ctml.h"
 
 namespace Cantera {
diff --git a/Cantera/src/converters/CKParser.cpp b/Cantera/src/converters/CKParser.cpp
index c24e7f789..006091d3f 100755
--- a/Cantera/src/converters/CKParser.cpp
+++ b/Cantera/src/converters/CKParser.cpp
@@ -21,7 +21,7 @@
 #include "CKParser.h"
 #include "ckr_utils.h"
 #include "writelog.h"
-#include <stdio.h>
+#include <cstdio>
 //#include "../stringUtils.h"
 
 using namespace std;
diff --git a/Cantera/src/converters/CKReader.cpp b/Cantera/src/converters/CKReader.cpp
index 4d7ee88d1..02c251e60 100755
--- a/Cantera/src/converters/CKReader.cpp
+++ b/Cantera/src/converters/CKReader.cpp
@@ -19,13 +19,13 @@ using namespace std;
 #include "CKReader.h"
 #include "thermoFunctions.h"
 
-#include <string.h>
-#include <stdlib.h>
-#include <time.h>
+#include <cstring>
+#include <cstdlib>
+#include <ctime>
 #include <iomanip>
 
 #include "writelog.h"
-#include <stdio.h>
+#include <cstdio>
 #include "ckr_defs.h"
 
 //#include "global.h"
diff --git a/Cantera/src/converters/writelog.cpp b/Cantera/src/converters/writelog.cpp
index 7a0a76389..bc1fec378 100755
--- a/Cantera/src/converters/writelog.cpp
+++ b/Cantera/src/converters/writelog.cpp
@@ -11,7 +11,7 @@
 #pragma warning(disable:4786)
 #endif
 
-#include <stdio.h>
+#include <cstdio>
 #include "writelog.h"
 
 using namespace std;
diff --git a/Cantera/src/kinetics/GasKinetics.h b/Cantera/src/kinetics/GasKinetics.h
index 2e74ea96d..815d78270 100755
--- a/Cantera/src/kinetics/GasKinetics.h
+++ b/Cantera/src/kinetics/GasKinetics.h
@@ -15,9 +15,7 @@
 #define CT_GASKINETICS_H
 
 #include <fstream>
-#include <math.h>
 #include <map>
-#include <stdlib.h>
 
 #include "mix_defs.h"
 #include "Kinetics.h"
@@ -29,6 +27,9 @@
 #include "FalloffMgr.h"
 #include "RateCoeffMgr.h"
 
+#include <cmath>
+#include <cstdlib>
+
 void get_wdot(const doublereal* rop, doublereal* wdot);
 
 namespace Cantera {
diff --git a/Cantera/src/kinetics/GasKineticsWriter.h b/Cantera/src/kinetics/GasKineticsWriter.h
index d21396f40..88b07a213 100755
--- a/Cantera/src/kinetics/GasKineticsWriter.h
+++ b/Cantera/src/kinetics/GasKineticsWriter.h
@@ -16,9 +16,7 @@
 #define WRITE_UPDATE
 
 #include <fstream>
-#include <math.h>
 #include <map>
-#include <stdlib.h>
 
 #include "mix_defs.h"
 #include "Kinetics.h"
@@ -30,6 +28,9 @@
 #include "RateCoeffMgr.h"
 #include "Phase.h"
 
+#include <cmath>
+#include <cstdlib>
+
 namespace Cantera {
 
     // forward references
diff --git a/Cantera/src/kinetics/InterfaceKinetics.h b/Cantera/src/kinetics/InterfaceKinetics.h
index ffc7259b7..3de46a1f1 100644
--- a/Cantera/src/kinetics/InterfaceKinetics.h
+++ b/Cantera/src/kinetics/InterfaceKinetics.h
@@ -15,9 +15,7 @@
 #define CT_IFACEKINETICS_H
 
 #include <fstream>
-#include <math.h>
 #include <map>
-#include <stdlib.h>
 
 #include "mix_defs.h"
 #include "Kinetics.h"
@@ -26,6 +24,9 @@
 #include "RateCoeffMgr.h"
 #include "ReactionStoichMgr.h"
 
+#include <cmath>
+#include <cstdlib>
+
 namespace Cantera {
 
     // forward references
diff --git a/Cantera/src/kinetics/solveSP.cpp b/Cantera/src/kinetics/solveSP.cpp
index 0d0985b0b..a44757365 100644
--- a/Cantera/src/kinetics/solveSP.cpp
+++ b/Cantera/src/kinetics/solveSP.cpp
@@ -17,9 +17,9 @@
 
 /* Standard include files */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cmath>
 
 #include <vector>
 
@@ -1111,7 +1111,7 @@ namespace Cantera {
             }
             else {
                 fprintf(stderr,"Unknown ifunc flag = %d\n", ifunc);
-                exit (-1);
+                exit(EXIT_FAILURE);
             }
 
             if (m_bulkFunc == BULK_DEPOSITION)
@@ -1120,7 +1120,7 @@ namespace Cantera {
                 printf("     Bulk Phases have fixed compositions\n");
             else {
                 fprintf(stderr,"Unknown bulkFunc flag = %d\n", m_bulkFunc);
-                exit (-1);
+                exit(EXIT_FAILURE);
             }
 
             if (damping)