Use of deprecated functions generates compiler warnings

include/cantera/base/ct_defs.h

@@ -26,6 +26,16 @@
 #include <string>
 #include <algorithm>
 
+// Warn about deprecated functions at compile time
+#ifdef __GNUC__
+#define DEPRECATED(func) func __attribute__ ((deprecated))
+#elif defined(_MSC_VER)
+#define DEPRECATED(func) __declspec(deprecated) func
+#else
+#pragma message("WARNING: You need to implement DEPRECATED for this compiler")
+#define DEPRECATED(func) func
+#endif
+
 /**
  * Namespace for the Cantera kernel.
  */

include/cantera/equil/MultiPhase.h

@@ -551,7 +551,7 @@ public:
      *               ThermoPhase objects.
      *               switch to uploadMoleFractionsFromPhases();
      */
-    void updateMoleFractions();
+    DEPRECATED(void updateMoleFractions());
 
     //! Update the locally-stored composition within this object
     //! to match the current compositions of the phase objects.

include/cantera/kinetics/Kinetics.h

@@ -144,10 +144,6 @@ public:
     /// Default constructor.
     Kinetics();
 
-    /// This constructor initializes with a starting phase.
-    /// @deprecated
-    //        Kinetics(thermo_t* thermo);
-
     /// Destructor.
     virtual ~Kinetics();
 
@@ -302,7 +298,7 @@ public:
      *
      * @param n Index of the ThermoPhase being sought.
      */
-    thermo_t& phase(size_t n=0) {
+    DEPRECATED(thermo_t& phase(size_t n=0)) {
         deprecatedMethod("Kinetics","phase","thermo");
         return *m_thermo[n];
     }
@@ -314,7 +310,7 @@ public:
      *
      * @param n Index of the ThermoPhase being sought.
      */
-    const thermo_t& phase(size_t n=0) const {
+    DEPRECATED(const thermo_t& phase(size_t n=0) const) {
         deprecatedMethod("Kinetics","phase","thermo");
         return *m_thermo[n];
     }
@@ -1061,7 +1057,6 @@ protected:
      */
     size_t m_surfphase;
 
-
     //! Phase Index where reactions are assumed to be taking place
     /*!
      *  We calculate this by assuming that the phase with the lowest dimensionality is the phase where reactions

include/cantera/thermo/HMWSoln.h

@@ -2143,7 +2143,7 @@ public:
      * @deprecated
      *   The getPartialMolarVolumes() expression is more precise.
      */
-    double speciesMolarVolume(int k) const;
+    DEPRECATED(double speciesMolarVolume(int k) const);
 
 
     //! Value of the Debye Huckel constant as a function of temperature

include/cantera/thermo/Phase.h

@@ -470,7 +470,7 @@ public:
      *
      * @deprecated
      */
-    void getMolecularWeights(int iwt, doublereal* weights) const;
+    DEPRECATED(void getMolecularWeights(int iwt, doublereal* weights) const);
 
     /**
      * Copy the vector of molecular weights into array weights.

include/cantera/thermo/SpeciesThermoMgr.h

@@ -371,7 +371,7 @@ class SpeciesThermo1 : public SpeciesThermo
 
 public:
     //! base constructor
-    SpeciesThermo1();
+    DEPRECATED(SpeciesThermo1());
     //! destructor
     virtual ~SpeciesThermo1();
 

include/cantera/transport/TransportBase.h

@@ -249,23 +249,19 @@ public:
 
     //! Returns an integer index number.
     /*!
-     *  This is for internal use
+     *  @internal This is for internal use
      *  of Cantera, and may be removed in the future.
      *
      *  @return  Returns the index number
-     *
-     *  @deprecated
      */
-    size_t index() const ;
+    size_t index() const;
 
     //! Set an integer index number.
     /*!
-     *  This is for internal use of
+     *  @internal This is for internal use of
      *  Cantera, and may be removed in the future.
      *
      *  @param i  index value
-     *
-     *  @deprecated
      */
     void setIndex(size_t i);
 
@@ -353,7 +349,7 @@ public:
      *
      * @deprecated This doesn't seem to be the essential input; it should just be the mobility.
      */
-    virtual void mobilityRatio(double* mobRat) {
+    DEPRECATED(virtual void mobilityRatio(double* mobRat)) {
         err("mobilityRatio");
     }
 

src/equil/MultiPhase.cpp

@@ -248,7 +248,7 @@ void MultiPhase::init()
     /// mole fractions stored in the phase objects
     m_init = true;
 
-    updateMoleFractions();
+    uploadMoleFractionsFromPhases();
 
     updatePhases();
 }