diff --git a/Cantera/src/base/ctml.cpp b/Cantera/src/base/ctml.cpp index 640cfa5dd..8de42e90f 100644 --- a/Cantera/src/base/ctml.cpp +++ b/Cantera/src/base/ctml.cpp @@ -878,7 +878,7 @@ namespace ctml { * @param v Output vector of floats containing the floatArray information. * @param convert Conversion to SI is carried out if this boolean is * True. The default is true. - * @param typeString String name of the type attribute. This is an optional + * @param unitsString String name of the type attribute. This is an optional * parameter. The default is to have an empty string. * The only string that is recognized is actEnergy. * Anything else has no effect. This affects what @@ -888,8 +888,9 @@ namespace ctml { * * @return Returns the number of floats read */ - int getFloatArray(const Cantera::XML_Node& node, vector_fp& v, const bool convert, - const std::string unitsString, const std::string nodeName) { + int getFloatArray(const Cantera::XML_Node& node, Cantera::vector_fp& v, + const bool convert, const std::string unitsString, + const std::string nodeName) { string::size_type icom; string numstr; doublereal dtmp; diff --git a/Cantera/src/base/ctml.h b/Cantera/src/base/ctml.h index 2fe84d95b..85d6f8a3b 100644 --- a/Cantera/src/base/ctml.h +++ b/Cantera/src/base/ctml.h @@ -358,7 +358,7 @@ namespace ctml { * @param v Output vector of floats containing the floatArray information. * @param convert Conversion to SI is carried out if this boolean is * True. The default is true. - * @param typeString String name of the type attribute. This is an optional + * @param unitsString String name of the type attribute. This is an optional * parameter. The default is to have an empty string. * The only string that is recognized is actEnergy. * Anything else has no effect. This affects what @@ -368,7 +368,7 @@ namespace ctml { * @return Returns the number of floats read into v. */ int getFloatArray(const Cantera::XML_Node& node, Cantera::vector_fp& v, - const bool convert=true, const std::string typeString="", + const bool convert=true, const std::string unitsString="", const std::string nodeName = "floatArray"); //! This function interprets the value portion of an XML element