Update some deprecation warnings.

This commit is contained in:
Ray Speth 2014-06-20 18:44:39 +00:00
parent e778afad32
commit 3349a28d38
7 changed files with 7 additions and 6 deletions

View file

@ -717,7 +717,7 @@ void getString(const Cantera::XML_Node& node, const std::string& titleString,
* @param[out] valueString Value string that is found in the child node.
* @param[out] typeString String type. This is an optional output variable.
* It is filled with the attribute "type" of the XML entry.
* @deprecated
* @deprecated To be removed after Cantera 2.2.
*/
void getNamedStringValue(const Cantera::XML_Node& node, const std::string& nameString, std::string& valueString,
std::string& typeString);

View file

@ -1478,7 +1478,7 @@ public:
* (These are the actionable element constraints).
*
* @return Returns number of components. This is the rank of the matrix
* @deprecated
* @deprecated To be removed after Cantera 2.2.
*/
int vcs_rank(const double* awtmp, size_t numSpecies, const double* matrix, size_t numElemConstraints,
std::vector<size_t> &compRes, std::vector<size_t> &elemComp, int* const usedZeroedSpecies) const;

View file

@ -103,7 +103,7 @@ public:
//! depends on #falloffType.
vector_fp falloffParameters;
int error; //!< @deprecated unused
int error; //!< @deprecated unused. To be removed after Cantera 2.2.
//! The reaction equation. Used only for display purposes.
std::string equation;

View file

@ -177,6 +177,7 @@ void getString(const Cantera::XML_Node& node, const std::string& titleString, st
void getNamedStringValue(const Cantera::XML_Node& node, const std::string& nameString, std::string& valueString,
std::string& typeString)
{
warn_deprecated("getNamedStringValue", "To be removed after Cantera 2.2");
valueString = "";
typeString = "";
if (node.hasChild(nameString)) {

View file

@ -81,7 +81,7 @@ void writeline(char repeat, size_t count, bool endl_after, bool endl_before)
void error(const std::string& msg)
{
warn_deprecated("error");
warn_deprecated("error", "To be removed after Cantera 2.2");
app()->logerror(msg);
}

View file

@ -46,7 +46,7 @@ namespace VCSnonideal {
int VCS_SOLVE::vcs_rank(const double * awtmp, size_t numSpecies, const double matrix[], size_t numElemConstraints,
std::vector<size_t> &compRes, std::vector<size_t>& elemComp, int * const usedZeroedSpecies) const
{
Cantera::warn_deprecated("VCS_SOLVE::vcs_rank", "To be removed after Cantera 2.2");
int lindep;
size_t j, k, jl, i, l, ml;
int numComponents = 0;

View file

@ -110,7 +110,7 @@ void DustyGasTransport::setThermo(thermo_t& thermo)
void DustyGasTransport::setParameters(const int type, const int k, const doublereal* const p)
{
warn_deprecated("DustyGasTransport::setParameters");
warn_deprecated("DustyGasTransport::setParameters", "To be removed after Cantera 2.2");
switch (type) {
case 0:
setPorosity(p[0]);