Index: src/libchcore/ConfigNodeContainer.h =================================================================== diff -u -N -r5324d0ca7af614cb066df1f121a7a338c4f7d7ed -ra44714d5c7ec0f50a376f4d0ea919ee5a224f834 --- src/libchcore/ConfigNodeContainer.h (.../ConfigNodeContainer.h) (revision 5324d0ca7af614cb066df1f121a7a338c4f7d7ed) +++ src/libchcore/ConfigNodeContainer.h (.../ConfigNodeContainer.h) (revision a44714d5c7ec0f50a376f4d0ea919ee5a224f834) @@ -188,7 +188,7 @@ } else { - m_mic.insert(ConfigNode(++m_stLastObjectID, pszPropName, 0, boost::lexical_cast(rValue).c_str())); + m_mic.insert(ConfigNode(++m_oidLastObjectID, pszPropName, 0, boost::lexical_cast(rValue).c_str())); return true; } } @@ -207,7 +207,7 @@ } else { - m_mic.insert(ConfigNode(++m_stLastObjectID, pszPropName, 0, bValue ? _T("true") : _T("false"))); + m_mic.insert(ConfigNode(++m_oidLastObjectID, pszPropName, 0, bValue ? _T("true") : _T("false"))); return true; } } @@ -230,8 +230,10 @@ void ImportFromPropertyTree(const boost::property_tree::wiptree& rTree, boost::unique_lock&); void ExportToPropertyTree(boost::property_tree::wiptree& rTree) const; +#ifdef _DEBUG // debugging void Dump(); +#endif private: void ImportNode(TString strCurrentPath, const boost::property_tree::wiptree& rTree); @@ -255,7 +257,7 @@ boost::signals2::signal m_notifier; TStringSet m_setDelayedNotifications; bool m_bDelayedEnabled; - size_t m_stLastObjectID; + object_id_t m_oidLastObjectID; TRemovedObjects m_setRemovedObjects;