From 3349a28d386beb73bf0046c4c1e97a2b1c5e28d2 Mon Sep 17 00:00:00 2001
From: Ray Speth <speth@mit.edu>
Date: Fri, 20 Jun 2014 18:44:39 +0000
Subject: [PATCH] Update some deprecation warnings.

---
 include/cantera/base/ctml.h             | 2 +-
 include/cantera/equil/vcs_solve.h       | 2 +-
 include/cantera/kinetics/ReactionData.h | 2 +-
 src/base/ctml.cpp                       | 1 +
 src/base/global.cpp                     | 2 +-
 src/equil/vcs_rank.cpp                  | 2 +-
 src/transport/DustyGasTransport.cpp     | 2 +-
 7 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/include/cantera/base/ctml.h b/include/cantera/base/ctml.h
index 77adf00d8..043f945f6 100644
--- a/include/cantera/base/ctml.h
+++ b/include/cantera/base/ctml.h
@@ -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);
diff --git a/include/cantera/equil/vcs_solve.h b/include/cantera/equil/vcs_solve.h
index ff60f0514..8a9601e28 100644
--- a/include/cantera/equil/vcs_solve.h
+++ b/include/cantera/equil/vcs_solve.h
@@ -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;
diff --git a/include/cantera/kinetics/ReactionData.h b/include/cantera/kinetics/ReactionData.h
index a21db6ba6..29353efbe 100644
--- a/include/cantera/kinetics/ReactionData.h
+++ b/include/cantera/kinetics/ReactionData.h
@@ -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;
diff --git a/src/base/ctml.cpp b/src/base/ctml.cpp
index 9d73d542a..56db97c1b 100644
--- a/src/base/ctml.cpp
+++ b/src/base/ctml.cpp
@@ -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)) {
diff --git a/src/base/global.cpp b/src/base/global.cpp
index 0d11bee13..b724d0983 100644
--- a/src/base/global.cpp
+++ b/src/base/global.cpp
@@ -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);
 }
 
diff --git a/src/equil/vcs_rank.cpp b/src/equil/vcs_rank.cpp
index 5a669dd8d..f7693d46a 100644
--- a/src/equil/vcs_rank.cpp
+++ b/src/equil/vcs_rank.cpp
@@ -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;
diff --git a/src/transport/DustyGasTransport.cpp b/src/transport/DustyGasTransport.cpp
index 891480623..177b6d027 100644
--- a/src/transport/DustyGasTransport.cpp
+++ b/src/transport/DustyGasTransport.cpp
@@ -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]);