diff --git a/include/cantera/kinetics/AqueousKinetics.h b/include/cantera/kinetics/AqueousKinetics.h index b87acd73d..28d884338 100644 --- a/include/cantera/kinetics/AqueousKinetics.h +++ b/include/cantera/kinetics/AqueousKinetics.h @@ -110,7 +110,10 @@ public: */ virtual Kinetics* duplMyselfAsKinetics(const std::vector & tpVector) const; - virtual int ID() const { + /** + * @deprecated use type() instead + */ + DEPRECATED(virtual int ID() const) { return cAqueousKinetics; } virtual int type() const { diff --git a/include/cantera/kinetics/EdgeKinetics.h b/include/cantera/kinetics/EdgeKinetics.h index 49b416128..d9161d74c 100644 --- a/include/cantera/kinetics/EdgeKinetics.h +++ b/include/cantera/kinetics/EdgeKinetics.h @@ -65,8 +65,9 @@ public: /** * Identifies the subclass of the Kinetics manager type. * These are listed in mix_defs.h. + * @deprecated use type() instead. */ - virtual int ID() const { + DEPRECATED(virtual int ID() const) { return cEdgeKinetics; } diff --git a/include/cantera/kinetics/GRI_30_Kinetics.h b/include/cantera/kinetics/GRI_30_Kinetics.h index 159e61eaf..fd08aedac 100644 --- a/include/cantera/kinetics/GRI_30_Kinetics.h +++ b/include/cantera/kinetics/GRI_30_Kinetics.h @@ -32,7 +32,10 @@ public: /// Destructor. virtual ~GRI_30_Kinetics() {} - virtual int ID() const { + /** + * @deprecated use type() instead + */ + DEPRECATED(virtual int ID() const) { return cGRI_30_Kinetics; } virtual int type() const { diff --git a/include/cantera/kinetics/GasKinetics.h b/include/cantera/kinetics/GasKinetics.h index 3e0bff502..f64b52fdc 100644 --- a/include/cantera/kinetics/GasKinetics.h +++ b/include/cantera/kinetics/GasKinetics.h @@ -133,8 +133,9 @@ public: //! Identifies the subclass of the Kinetics manager type. /*! * These are listed in mix_defs.h. + * @deprecated use type() instead */ - virtual int ID() const { + DEPRECATED(virtual int ID() const) { return cGasKinetics; } diff --git a/include/cantera/kinetics/InterfaceKinetics.h b/include/cantera/kinetics/InterfaceKinetics.h index 2956cff7e..1a5464f96 100644 --- a/include/cantera/kinetics/InterfaceKinetics.h +++ b/include/cantera/kinetics/InterfaceKinetics.h @@ -154,7 +154,8 @@ public: virtual Kinetics* duplMyselfAsKinetics(const std::vector & tpVector) const; //! Return the ID of the kinetics object - virtual int ID() const; + //! @deprecated use type() instead + DEPRECATED(virtual int ID() const); //! Retunr the type of the kinetics object virtual int type() const; diff --git a/include/cantera/kinetics/Kinetics.h b/include/cantera/kinetics/Kinetics.h index d430a0cb9..70cd1a1a1 100644 --- a/include/cantera/kinetics/Kinetics.h +++ b/include/cantera/kinetics/Kinetics.h @@ -197,8 +197,9 @@ public: //! Identifies the subclass of the Kinetics manager type. /*! * These are listed in mix_defs.h. + * @deprecated use type() instead */ - virtual int ID() const; + DEPRECATED(virtual int ID() const); //! Identifies the kinetics manager type. /*!