diff --git a/include/cantera/base/global.h b/include/cantera/base/global.h index 5e2cb1101..d4c743b3e 100644 --- a/include/cantera/base/global.h +++ b/include/cantera/base/global.h @@ -335,8 +335,9 @@ void error(const std::string& msg); * class logger and inherited classes of logger. * * @ingroup textlogs + * @deprecated */ -int userInterface(); +DEPRECATED(int userInterface()); //! Install a logger. /*! diff --git a/include/cantera/base/logger.h b/include/cantera/base/logger.h index 5384e0132..91740e079 100644 --- a/include/cantera/base/logger.h +++ b/include/cantera/base/logger.h @@ -6,6 +6,8 @@ #ifndef CT_LOGGER_H #define CT_LOGGER_H +#include "ct_defs.h" + #include #include #include @@ -87,7 +89,8 @@ public: } /// Return an integer specifying the application environment. - virtual int env() { + /// @deprecated + DEPRECATED(virtual int env()) { return 0; } }; diff --git a/src/base/application.h b/src/base/application.h index f560cb2e1..89d072af0 100644 --- a/src/base/application.h +++ b/src/base/application.h @@ -174,7 +174,8 @@ protected: void logerror(const std::string& msg) ; //! Returns an integer specifying the application environment - int getUserEnv() ; + //! @deprecated + DEPRECATED(int getUserEnv()) ; //! Install a logger. /*! @@ -581,7 +582,8 @@ public: } //! Returns an integer specifying the application environment. - int getUserEnv() { + //! @deprecated + DEPRECATED(int getUserEnv()) { return pMessenger->getUserEnv() ; } diff --git a/src/matlab/mllogger.h b/src/matlab/mllogger.h index d1fc8ddcd..e2016c7b8 100644 --- a/src/matlab/mllogger.h +++ b/src/matlab/mllogger.h @@ -51,7 +51,7 @@ public: mexErrMsgTxt(err.c_str()); } - virtual int env() { + DEPRECATED(virtual int env()) { return 1; } }; diff --git a/src/python/pylogger.h b/src/python/pylogger.h index be0c18376..f950ce244 100644 --- a/src/python/pylogger.h +++ b/src/python/pylogger.h @@ -39,7 +39,7 @@ public: PyRun_SimpleString((char*)err.c_str()); } - virtual int env() { + DEPRECATED(virtual int env()) { return 2; } };