diff -r 7c724be8f9a6 -r 358f71a624d8 src/core/model/traced-callback.h --- a/src/core/model/traced-callback.h Fri May 13 14:51:51 2011 -0400 +++ b/src/core/model/traced-callback.h Fri May 13 14:52:27 2011 -0400 @@ -88,7 +88,7 @@ void operator() (T1 a1, T2 a2, T3 a3, T4 a4, T5 a5, T6 a6, T7 a7) const; void operator() (T1 a1, T2 a2, T3 a3, T4 a4, T5 a5, T6 a6, T7 a7, T8 a8) const; -private: +private: typedef std::list > CallbackList; CallbackList m_callbackList; }; @@ -105,23 +105,24 @@ typename T7, typename T8> TracedCallback::TracedCallback () : m_callbackList () -{} -template -void +void TracedCallback::ConnectWithoutContext (const CallbackBase & callback) { Callback cb; cb.Assign (callback); m_callbackList.push_back (cb); } -template -void +void TracedCallback::Connect (const CallbackBase & callback, std::string path) { Callback cb; @@ -140,13 +141,13 @@ i != m_callbackList.end (); /* empty */) { if ((*i).IsEqual (callback)) - { - i = m_callbackList.erase (i); - } + { + i = m_callbackList.erase (i); + } else - { - i++; - } + { + i++; + } } } template