From 9a8fe5b47e6c14b8e2219d36d7e9644e7b80dd5a Mon Sep 17 00:00:00 2001
From: Harry Moffat <hkmoffa@sandia.gov>
Date: Mon, 23 Aug 2010 17:59:37 +0000
Subject: [PATCH] doxygen changes doxygen has troubles differentiating between
 Cantera::vector_fp and    std::vector<doublereal>. I don't know what to do.

---
 Cantera/src/base/ctml.cpp   | 4 ++--
 Cantera/src/base/ctml.h     | 4 ++--
 Cantera/src/base/mdp_allo.h | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Cantera/src/base/ctml.cpp b/Cantera/src/base/ctml.cpp
index 0ed75a220..45172dd54 100644
--- a/Cantera/src/base/ctml.cpp
+++ b/Cantera/src/base/ctml.cpp
@@ -959,7 +959,7 @@ namespace ctml {
    *
    *  @note change the v to a std::vector to eliminate a doxygen error. No idea why doxygen needs this.
    */
-  int  getFloatArray(const Cantera::XML_Node& node, Cantera::vector_fp & v, 
+  int  getFloatArray(const Cantera::XML_Node& node, std::vector<doublereal> & v, 
                      const bool convert, const std::string unitsString,
                      const std::string nodeName) {
     std::string::size_type icom;
@@ -1332,7 +1332,7 @@ namespace ctml {
    *   @param  coeffs       Output vector of floats containing the floatArray information.
    */
   void getFunction(const Cantera::XML_Node& node, std::string& type, doublereal& xmin,
-		   doublereal& xmax,  Cantera::vector_fp & coeffs) {
+		   doublereal& xmax, std::vector<doublereal> & coeffs) {
     const XML_Node& c = node.child("floatArray");
     coeffs.clear();
     getFloatArray(c,coeffs);
diff --git a/Cantera/src/base/ctml.h b/Cantera/src/base/ctml.h
index de39776a6..6c57abdee 100644
--- a/Cantera/src/base/ctml.h
+++ b/Cantera/src/base/ctml.h
@@ -370,7 +370,7 @@ namespace ctml {
    *                        The default value for the node name is floatArray
    *   @return              Returns the number of floats read into v.
    */
-  int getFloatArray(const Cantera::XML_Node& node, Cantera::vector_fp & v, 
+  int getFloatArray(const Cantera::XML_Node& node, std::vector<doublereal> & v, 
 		     const bool convert=true, const std::string unitsString="",
 		     const std::string nodeName = "floatArray");
 
@@ -836,7 +836,7 @@ namespace ctml {
    *   @param  coeffs       Output vector of floats containing the floatArray information.
    */
   void getFunction(const Cantera::XML_Node& node, std::string& typeString, 
-		   doublereal& xmin, doublereal& xmax, Cantera::vector_fp & coeffs);
+		   doublereal& xmin, doublereal& xmax, std::vector<doublereal> & coeffs);
 
   //! Search the child nodes of the current node for an XML Node with a Title
   //! attribute of a given name.
diff --git a/Cantera/src/base/mdp_allo.h b/Cantera/src/base/mdp_allo.h
index ef41f9b95..756b6dce4 100644
--- a/Cantera/src/base/mdp_allo.h
+++ b/Cantera/src/base/mdp_allo.h
@@ -45,7 +45,7 @@
  *  then it may be freed, always (and vica-versa).
  *
  *  Where possible, the low leve routines 
- *   memcopy and memset are used to copy or zero memory.
+ *   memcpy and memset are used to copy or zero memory.
  *
  *  No array bounds checking is ever done within these routines. buyer beware.
  *  The bounds of arrays are not carried with the array object, ever.