From e2fb5d3483a8096ba5b4722eaeca3c196a2022bc Mon Sep 17 00:00:00 2001
From: Harry Moffat <hkmoffa@sandia.gov>
Date: Tue, 9 Feb 2010 19:57:02 +0000
Subject: [PATCH] Fixed compilation errors on solaris.

---
 Cantera/src/base/checkFinite.cpp |  2 ++
 Cantera/src/base/misc.cpp        | 26 ++++++++++++++++----------
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/Cantera/src/base/checkFinite.cpp b/Cantera/src/base/checkFinite.cpp
index b20096b99..be4fa224d 100644
--- a/Cantera/src/base/checkFinite.cpp
+++ b/Cantera/src/base/checkFinite.cpp
@@ -14,6 +14,8 @@
  * See file License.txt for licensing information.
  */
 
+#include "ct_defs.h"
+
 #include <stdexcept>
 #include <string>
 
diff --git a/Cantera/src/base/misc.cpp b/Cantera/src/base/misc.cpp
index b8893514e..9d39cfc12 100644
--- a/Cantera/src/base/misc.cpp
+++ b/Cantera/src/base/misc.cpp
@@ -1423,28 +1423,34 @@ protected:
 
     doublereal toSI(std::string unit) {
         doublereal f = Unit::units()->toSI(unit);
-        if (f) return f;
-        else throw CanteraError("toSI","unknown unit string: "+unit);
-        //return 1.0;
+        if (f) {
+          return f;
+        } else {
+          throw CanteraError("toSI","unknown unit string: "+unit);
+        }
+        return 1.0;
     }
 
     doublereal actEnergyToSI(std::string unit) {
         doublereal f = Unit::units()->actEnergyToSI(unit);
-        if (f) return f;
-        else return 1.0;
+        if (f) {
+          return f;
+        }
+        return 1.0;
     }
 
     string canteraRoot() {
         char* ctroot = 0;
         ctroot = getenv("CANTERA_ROOT");
-        if (ctroot != 0) { return string(ctroot); }
-        else {
+        if (ctroot != 0) { 
+          return string(ctroot);
+        } 
 #ifdef CANTERA_ROOT
-            return string(CANTERA_ROOT);
+        return string(CANTERA_ROOT);
 #else
-            return "";
+        return "";
 #endif
-        }
+        
     }
 
     // exceptions