diff --git a/Cantera/src/thermo/SimpleThermo.h b/Cantera/src/thermo/SimpleThermo.h index a2aeaf1bb..e8d106bba 100644 --- a/Cantera/src/thermo/SimpleThermo.h +++ b/Cantera/src/thermo/SimpleThermo.h @@ -70,6 +70,9 @@ namespace Cantera { virtual ~SimpleThermo() {} //! Copy constructor + /*! + * @param right Object to be copied + */ SimpleThermo(const SimpleThermo &right) : ID(SIMPLE), m_tlow_max(0.0), @@ -83,7 +86,10 @@ namespace Cantera { } //! Assignment operator - SimpleThermo& SimpleThermo::operator=(const SimpleThermo &right) { + /*! + * @param right Object to be copied + */ + SimpleThermo& operator=(const SimpleThermo &right) { /* * Check for self assignment. */ diff --git a/Cantera/src/thermo/SpeciesThermoFactory.cpp b/Cantera/src/thermo/SpeciesThermoFactory.cpp index abd22e950..9f253b1db 100755 --- a/Cantera/src/thermo/SpeciesThermoFactory.cpp +++ b/Cantera/src/thermo/SpeciesThermoFactory.cpp @@ -36,9 +36,10 @@ using namespace ctml; namespace Cantera { SpeciesThermoFactory* SpeciesThermoFactory::s_factory = 0; - #if defined(THREAD_SAFE_CANTERA) - boost::mutex SpeciesThermoFactory::species_thermo_mutex ; - #endif + +#if defined(THREAD_SAFE_CANTERA) + boost::mutex SpeciesThermoFactory::species_thermo_mutex ; +#endif /** diff --git a/Cantera/src/thermo/SpeciesThermoFactory.h b/Cantera/src/thermo/SpeciesThermoFactory.h index 5e0b4c587..97c6e6a50 100755 --- a/Cantera/src/thermo/SpeciesThermoFactory.h +++ b/Cantera/src/thermo/SpeciesThermoFactory.h @@ -90,7 +90,7 @@ namespace Cantera { */ virtual void deleteFactory() { #if defined(THREAD_SAFE_CANTERA) - boost::mutex::scoped_lock lock(species_thermo_mutex); + boost::mutex::scoped_lock lock(species_thermo_mutex); #endif if (s_factory) { delete s_factory; @@ -163,7 +163,8 @@ namespace Cantera { static SpeciesThermoFactory* s_factory; #if defined(THREAD_SAFE_CANTERA) - static boost::mutex species_thermo_mutex; + //! Decl of the static mutex variable that locks the %SpeciesThermo factory singelton + static boost::mutex species_thermo_mutex; #endif //! Constructor. This is made private, so that only the static diff --git a/Cantera/src/thermo/SpeciesThermoMgr.h b/Cantera/src/thermo/SpeciesThermoMgr.h index 70904ae64..344408dc6 100755 --- a/Cantera/src/thermo/SpeciesThermoMgr.h +++ b/Cantera/src/thermo/SpeciesThermoMgr.h @@ -158,6 +158,9 @@ namespace Cantera { virtual ~SpeciesThermoDuo(){} //! copy constructor + /*! + * @param right Object to be copied + */ SpeciesThermoDuo(const SpeciesThermoDuo &right) { *this = operator=(right); } @@ -407,6 +410,9 @@ namespace Cantera { virtual ~SpeciesThermo1(){} //! Copy Constructor + /*! + * @param right Object to be copied + */ SpeciesThermo1(const SpeciesThermo1 &right) : m_pref(0.0) { diff --git a/Cantera/src/thermo/ThermoFactory.h b/Cantera/src/thermo/ThermoFactory.h index 2e5857f2b..1166d59b3 100644 --- a/Cantera/src/thermo/ThermoFactory.h +++ b/Cantera/src/thermo/ThermoFactory.h @@ -29,7 +29,7 @@ namespace Cantera { - class SpeciesThermoFactory; + class SpeciesThermoFactory; /*! * @addtogroup thermoprops @@ -65,7 +65,7 @@ namespace Cantera { * This class keeps a list of the known ThermoPhase classes, and is * used to create new instances of these classes. */ - class ThermoFactory : public FactoryBase { + class ThermoFactory : public FactoryBase { public: @@ -113,11 +113,13 @@ namespace Cantera { //! static member of a single instance static ThermoFactory* s_factory; - //! Private constructor prevents usage - ThermoFactory(){} + //! Private constructors prevents usage + ThermoFactory(){}; + #if defined(THREAD_SAFE_CANTERA) - static boost::mutex thermo_mutex; + //! Decl for locking mutex for thermo factory singelton + static boost::mutex thermo_mutex; #endif };