From 527ccbe7432edc32d056e5eb3d6a8785f8ebf32a Mon Sep 17 00:00:00 2001
From: Harry Moffat <hkmoffa@sandia.gov>
Date: Tue, 3 Mar 2009 20:37:18 +0000
Subject: [PATCH] Solaris porting issues -> failed to link in some cases.

---
 Cantera/src/transport/AqueousTransport.h   | 7 ++++---
 Cantera/src/transport/MultiTransport.cpp   | 5 +++++
 Cantera/src/transport/MultiTransport.h     | 4 ++--
 Cantera/src/transport/TransportBase.h      | 4 ++--
 Cantera/src/transport/TransportFactory.cpp | 4 ++++
 5 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/Cantera/src/transport/AqueousTransport.h b/Cantera/src/transport/AqueousTransport.h
index 21c936dea..4df1172b7 100644
--- a/Cantera/src/transport/AqueousTransport.h
+++ b/Cantera/src/transport/AqueousTransport.h
@@ -126,6 +126,9 @@ namespace Cantera {
 
   public:
 
+    //! default constructor
+    AqueousTransport();
+
     //! virtual destructor
     virtual ~AqueousTransport() {}
 
@@ -288,10 +291,8 @@ namespace Cantera {
 
     //! Solve the stefan_maxell equations for the diffusive fluxes.
     void stefan_maxwell_solve();
-  protected:
+ 
 
-    //! default constructor
-    AqueousTransport();
 
   private:
 
diff --git a/Cantera/src/transport/MultiTransport.cpp b/Cantera/src/transport/MultiTransport.cpp
index 166204b0f..895edab1d 100755
--- a/Cantera/src/transport/MultiTransport.cpp
+++ b/Cantera/src/transport/MultiTransport.cpp
@@ -137,6 +137,11 @@ namespace Cantera {
     {
     }
 
+
+  MultiTransport::~MultiTransport() {
+
+  }
+
     bool MultiTransport::init(TransportParams& tr) {
 
         // constant mixture attributes
diff --git a/Cantera/src/transport/MultiTransport.h b/Cantera/src/transport/MultiTransport.h
index 617cd73bd..a16641787 100755
--- a/Cantera/src/transport/MultiTransport.h
+++ b/Cantera/src/transport/MultiTransport.h
@@ -76,7 +76,7 @@ namespace Cantera {
     public:
 
 
-        virtual ~MultiTransport() {}
+      virtual ~MultiTransport();
 
         // overloaded base class methods
         virtual int model() {
@@ -197,8 +197,8 @@ namespace Cantera {
 	 */
 	struct GasTransportData getGasTransportData(int);
 
-    protected:
 
+    protected:
         /// default constructor
         MultiTransport(thermo_t* thermo=0);
 
diff --git a/Cantera/src/transport/TransportBase.h b/Cantera/src/transport/TransportBase.h
index 60142e86c..25dd1ee26 100755
--- a/Cantera/src/transport/TransportBase.h
+++ b/Cantera/src/transport/TransportBase.h
@@ -4,7 +4,6 @@
  */
 
 /*
- * $Author$
  * $Revision$
  * $Date$
  */
@@ -69,7 +68,7 @@ namespace Cantera {
      */
     Transport(thermo_t* thermo=0, int ndim = 1);
 
-    ///< Destructor.
+    //! Destructor.
     virtual ~Transport();   
 
     //!  Copy Constructor for the %Transport  object.
@@ -97,6 +96,7 @@ namespace Cantera {
      *  These routines are basically wrappers around the derived copy
      *  constructor.
      */
+    // Note ->need working copy constructors and operator=() functions for all first
     virtual Transport *duplMyselfAsTransport() const;
 
 
diff --git a/Cantera/src/transport/TransportFactory.cpp b/Cantera/src/transport/TransportFactory.cpp
index 35411f696..383b685bd 100755
--- a/Cantera/src/transport/TransportFactory.cpp
+++ b/Cantera/src/transport/TransportFactory.cpp
@@ -21,8 +21,12 @@
 #include "SolidTransport.h"
 #include "DustyGasTransport.h"
 
+#ifdef WITH_IDEAL_SOLUTIONS
 #include "LiquidTransport.h"
+#endif
+#ifdef WITH_ELECTROLYTES
 #include "AqueousTransport.h"
+#endif
 
 #include "TransportFactory.h"