From 89339ce847159964407fb43e2f80072895db70bb Mon Sep 17 00:00:00 2001
From: Harry Moffat <hkmoffa@sandia.gov>
Date: Thu, 14 Dec 2006 18:24:25 +0000
Subject: [PATCH] solaris port std:: additions

---
 Cantera/src/NasaPoly1.h | 10 +++++-----
 Cantera/src/NasaPoly2.h |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Cantera/src/NasaPoly1.h b/Cantera/src/NasaPoly1.h
index 6613e2e73..6d4eec7aa 100755
--- a/Cantera/src/NasaPoly1.h
+++ b/Cantera/src/NasaPoly1.h
@@ -59,7 +59,7 @@ namespace Cantera {
             m_Pref      (pref),
             m_index     (n),
             m_coeff     (array_fp(7)) {
-            copy(coeffs, coeffs + 7, m_coeff.begin());
+            std::copy(coeffs, coeffs + 7, m_coeff.begin());
         }
 
 	NasaPoly1(const NasaPoly1& b) :
@@ -68,7 +68,7 @@ namespace Cantera {
             m_Pref      (b.m_Pref),
             m_index     (b.m_index),
             m_coeff     (array_fp(7)) {
-            copy(b.m_coeff.begin(),
+            std::copy(b.m_coeff.begin(),
 		 b.m_coeff.begin() + 7,
 		 m_coeff.begin());
 	}
@@ -79,7 +79,7 @@ namespace Cantera {
 	      m_highT  = b.m_highT;
 	      m_Pref   = b.m_Pref;
 	      m_index  = b.m_index;
-	      copy(b.m_coeff.begin(),
+	      std::copy(b.m_coeff.begin(),
 		   b.m_coeff.begin() + 7,
 		   m_coeff.begin());
 	    }
@@ -114,7 +114,7 @@ namespace Cantera {
 	 *  tt[2] = m_t[1]*t;
 	 *  tt[3] = m_t[2]*t;
 	 *  tt[4] = 1.0/t;
-	 *  tt[5] = log(t);
+	 *  tt[5] = std::log(t);
          */
         virtual void updateProperties(const doublereal* tt, 
             doublereal* cp_R, doublereal* h_RT, doublereal* s_R) const {
@@ -157,7 +157,7 @@ namespace Cantera {
 	    tPoly[2]  = tPoly[1] * temp;
 	    tPoly[3]  = tPoly[2] * temp;
 	    tPoly[4]  = 1.0 / temp;
-	    tPoly[5]  = log(temp);
+	    tPoly[5]  = std::log(temp);
 	    updateProperties(tPoly, cp_R, h_RT, s_R);
 	}
 
diff --git a/Cantera/src/NasaPoly2.h b/Cantera/src/NasaPoly2.h
index 4caa4e153..58e6ea977 100644
--- a/Cantera/src/NasaPoly2.h
+++ b/Cantera/src/NasaPoly2.h
@@ -71,7 +71,7 @@ namespace Cantera {
             m_index(n),
             m_coeff(array_fp(15)) {
 
-            copy(coeffs, coeffs + 15, m_coeff.begin());
+            std::copy(coeffs, coeffs + 15, m_coeff.begin());
 	    m_midT = coeffs[0];
 	    mnp_low  = new NasaPoly1(m_index, m_lowT, m_midT,
 				     m_Pref, &m_coeff[1]);
@@ -89,7 +89,7 @@ namespace Cantera {
             m_index(b.m_index),
             m_coeff(array_fp(15)) {
 
-            copy(b.m_coeff.begin(),
+            std::copy(b.m_coeff.begin(),
 		 b.m_coeff.begin() + 15,
 		 m_coeff.begin());
 	    mnp_low  = new NasaPoly1(m_index, m_lowT, m_midT,
@@ -105,7 +105,7 @@ namespace Cantera {
 	      m_highT  = b.m_highT;
 	      m_Pref   = b.m_Pref;
 	      m_index  = b.m_index;
-	      copy(b.m_coeff.begin(),
+	      std::copy(b.m_coeff.begin(),
 		   b.m_coeff.begin() + 15,
 		   m_coeff.begin());
 	      if (mnp_low) delete mnp_low;