From c0543fe571848d8ecf59fd766a33a42ad44a5afd Mon Sep 17 00:00:00 2001
From: Harry Moffat <hkmoffa@sandia.gov>
Date: Tue, 3 Mar 2009 19:47:25 +0000
Subject: [PATCH] Fixed compilation problems that occurred when porting to
 solaris

---
 Cantera/src/transport/AqueousTransport.cpp  | 2 +-
 Cantera/src/transport/AqueousTransport.h    | 2 +-
 Cantera/src/transport/DustyGasTransport.cpp | 2 +-
 Cantera/src/transport/DustyGasTransport.h   | 2 +-
 Cantera/src/transport/LiquidTransport.cpp   | 4 ++--
 Cantera/src/transport/LiquidTransport.h     | 4 ++--
 Cantera/src/transport/SolidTransport.cpp    | 2 +-
 Cantera/src/transport/SolidTransport.h      | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Cantera/src/transport/AqueousTransport.cpp b/Cantera/src/transport/AqueousTransport.cpp
index 520f9cad4..0eca6455b 100644
--- a/Cantera/src/transport/AqueousTransport.cpp
+++ b/Cantera/src/transport/AqueousTransport.cpp
@@ -288,7 +288,7 @@ namespace Cantera {
    * \f]
    */
   void AqueousTransport::getSpeciesFluxes(int ndim, 
-					 doublereal* grad_T, 
+					 const doublereal* grad_T, 
 					 int ldx, const doublereal* grad_X, 
 					 int ldf, doublereal* fluxes) {
     set_Grad_T(grad_T);
diff --git a/Cantera/src/transport/AqueousTransport.h b/Cantera/src/transport/AqueousTransport.h
index 3b2e68dbb..21c936dea 100644
--- a/Cantera/src/transport/AqueousTransport.h
+++ b/Cantera/src/transport/AqueousTransport.h
@@ -249,7 +249,7 @@ namespace Cantera {
      *
      */
      virtual void getSpeciesFluxes(int ndim, 
-				  doublereal* grad_T, 
+				  const doublereal* grad_T, 
 				  int ldx, const doublereal* grad_X, 
 				  int ldf, doublereal* fluxes);
 
diff --git a/Cantera/src/transport/DustyGasTransport.cpp b/Cantera/src/transport/DustyGasTransport.cpp
index 5cb8c3c2c..e122fee01 100644
--- a/Cantera/src/transport/DustyGasTransport.cpp
+++ b/Cantera/src/transport/DustyGasTransport.cpp
@@ -53,7 +53,7 @@ namespace Cantera {
           m_gastran(0)
     {}
 
-        void DustyGasTransport::setParameters(int type, int k, doublereal* p) {
+        void DustyGasTransport::setParameters(const int type, const int k, const doublereal* const p) {
             switch(type) {
             case 0:
                 setPorosity(p[0]); break;
diff --git a/Cantera/src/transport/DustyGasTransport.h b/Cantera/src/transport/DustyGasTransport.h
index 2c359fb85..b6cb0754d 100644
--- a/Cantera/src/transport/DustyGasTransport.h
+++ b/Cantera/src/transport/DustyGasTransport.h
@@ -42,7 +42,7 @@ namespace Cantera {
 
         virtual int model() { return cDustyGasTransport; }
 
-        virtual void setParameters(int type, int k, doublereal* p);
+        virtual void setParameters(const int type, const int k, const doublereal* const p);
         
         virtual void getMultiDiffCoeffs(int ld, doublereal* d);
         
diff --git a/Cantera/src/transport/LiquidTransport.cpp b/Cantera/src/transport/LiquidTransport.cpp
index a1e9cc6a5..c5a6e8e08 100644
--- a/Cantera/src/transport/LiquidTransport.cpp
+++ b/Cantera/src/transport/LiquidTransport.cpp
@@ -162,7 +162,7 @@ namespace Cantera {
   /*
    *  This is where we dimension everything.
    */
-  bool LiquidTransport::init(LiquidTransportParams& tr) {
+  bool LiquidTransport::initLiquid(LiquidTransportParams& tr) {
 
     // constant substance attributes
     m_thermo = tr.thermo;
@@ -396,7 +396,7 @@ namespace Cantera {
    * \f]
    */
   void LiquidTransport::getSpeciesFluxes(int ndim, 
-					 doublereal* grad_T, 
+					 const doublereal* grad_T, 
 					 int ldx, const doublereal* grad_X, 
 					 int ldf, doublereal* fluxes) {
     set_Grad_T(grad_T);
diff --git a/Cantera/src/transport/LiquidTransport.h b/Cantera/src/transport/LiquidTransport.h
index e1c72a086..c296bf9e2 100644
--- a/Cantera/src/transport/LiquidTransport.h
+++ b/Cantera/src/transport/LiquidTransport.h
@@ -302,7 +302,7 @@ namespace Cantera {
      *
      */
      virtual void getSpeciesFluxes(int ndim, 
-				  doublereal* grad_T, 
+				  const doublereal* grad_T, 
 				  int ldx, const doublereal* grad_X, 
 				  int ldf, doublereal* fluxes);
 
@@ -339,7 +339,7 @@ namespace Cantera {
      * @param tr  Transport parameters for all of the species
      *            in the phase.
      */
-    virtual bool init(LiquidTransportParams& tr);
+    virtual bool initLiquid(LiquidTransportParams& tr);
 
     friend class TransportFactory;
 
diff --git a/Cantera/src/transport/SolidTransport.cpp b/Cantera/src/transport/SolidTransport.cpp
index b4b6982c6..3ca2e4f32 100644
--- a/Cantera/src/transport/SolidTransport.cpp
+++ b/Cantera/src/transport/SolidTransport.cpp
@@ -29,7 +29,7 @@ namespace Cantera {
 
     SolidTransport::SolidTransport() {}
 
-    void SolidTransport::setParameters(int n, int k, double* p) {
+    void SolidTransport::setParameters(const int n, const int k, const double* const p) {
         switch (n) {
             
         case 0:
diff --git a/Cantera/src/transport/SolidTransport.h b/Cantera/src/transport/SolidTransport.h
index 6507c417c..7d9b299e1 100644
--- a/Cantera/src/transport/SolidTransport.h
+++ b/Cantera/src/transport/SolidTransport.h
@@ -51,7 +51,7 @@ virtual ~SolidTransport() {}
         virtual doublereal thermalConductivity();
         virtual void getMixDiffCoeffs(doublereal* d);
         virtual void getMobilities(doublereal* mobil);
-        virtual void setParameters(int n, int k, doublereal* p);
+        virtual void setParameters(const int n, const int k, const doublereal* const p);
 
         friend class TransportFactory;