From b5c5835ca9bda420f69cc15ac11a36813e20d431 Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Fri, 21 Feb 2014 19:08:13 +0000 Subject: [PATCH] Remove superfluous use of 'inline' Member functions defined in the class body are always 'inline'. --- include/cantera/base/Array.h | 2 +- include/cantera/base/XML_Writer.h | 8 ++++---- include/cantera/equil/MultiPhaseEquil.h | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/cantera/base/Array.h b/include/cantera/base/Array.h index 57b24cdb9..7682a8015 100644 --- a/include/cantera/base/Array.h +++ b/include/cantera/base/Array.h @@ -253,7 +253,7 @@ public: } //! Set all of the entries to zero - inline void zero() { + void zero() { size_t nn = m_nrows * m_ncols; if (nn > 0) { /* diff --git a/include/cantera/base/XML_Writer.h b/include/cantera/base/XML_Writer.h index 158aa9433..f9eb1bebb 100644 --- a/include/cantera/base/XML_Writer.h +++ b/include/cantera/base/XML_Writer.h @@ -26,7 +26,7 @@ public: return m_s; } - inline std::string XML_filter(const std::string& name) { + std::string XML_filter(const std::string& name) { int ns = static_cast(name.size()); std::string nm(name); for (int m = 0; m < ns; m++) @@ -51,14 +51,14 @@ public: * s : Output stream containing the XML file * comment : Reference to a string containing the comment */ - inline void XML_comment(std::ostream& s, const std::string& comment) { + void XML_comment(std::ostream& s, const std::string& comment) { for (int n = 0; n < _level; n++) { s << _indent; } s << "" << std::endl; } - inline void XML_open(std::ostream& s, const std::string& tag, const std::string& p = "") { + void XML_open(std::ostream& s, const std::string& tag, const std::string& p = "") { for (int n = 0; n < _level; n++) { s << _indent; } @@ -66,7 +66,7 @@ public: s << "<" << XML_filter(tag) << p << ">" << std::endl; } - inline void XML_close(std::ostream& s, const std::string& tag) { + void XML_close(std::ostream& s, const std::string& tag) { _level--; for (int n = 0; n < _level; n++) { s << _indent; diff --git a/include/cantera/equil/MultiPhaseEquil.h b/include/cantera/equil/MultiPhaseEquil.h index 60794b0e4..ba86e3963 100644 --- a/include/cantera/equil/MultiPhaseEquil.h +++ b/include/cantera/equil/MultiPhaseEquil.h @@ -65,10 +65,10 @@ public: int maxsteps = 1000, int loglevel=-99); doublereal error(); - inline std::string reactionString(size_t j) { + std::string reactionString(size_t j) { return std::string(""); } - inline void printInfo(int loglevel) {} + void printInfo(int loglevel) {} void setInitialMixMoles(int loglevel = 0) { setInitialMoles(loglevel);