Index: ext/libicpf/src/callback.cpp
===================================================================
diff -u -N -re17c80d36eaa0430313e7d1058aa7a301d1510af -r0e69c2afbbe421971214a48e18c00f24a051518f
--- ext/libicpf/src/callback.cpp	(.../callback.cpp)	(revision e17c80d36eaa0430313e7d1058aa7a301d1510af)
+++ ext/libicpf/src/callback.cpp	(.../callback.cpp)	(revision 0e69c2afbbe421971214a48e18c00f24a051518f)
@@ -24,129 +24,4 @@
 
 BEGIN_ICPF_NAMESPACE
 
-callback1::callback1()
-{
-	
-}
-
-callback1::~callback1()
-{
-	
-}
-
-/** Executes a callback list associated with this object.
- * \param[in] pData - parameter that will be passed to a user callback function
- */
-void callback1::exec(ptr_t pData)
-{
-	m_lock.lock();
-	try
-	{
-		for (std::list<_CALLBACKDATA1>::iterator it=m_lCalls.begin();it != m_lCalls.end();it++)
-			(*((*it).pfn))((*it).pParam, pData);
-		m_lock.unlock();
-	}
-	catch(...)
-	{
-		m_lock.unlock();
-		throw;
-	}
-}
-
-/** Connects a user callback function to this object.
- * \param[in] pfn - user callback function address
- * \param[in] pParam - user parameter to pass to the callback function when executing
- */
-void callback1::connect(PFNCALLBACKPROC1 pfn, ptr_t pParam)
-{
-	_CALLBACKDATA1 cd;
-	cd.pfn=pfn;
-	cd.pParam=pParam;
-
-	m_lock.lock();
-	m_lCalls.push_back(cd);
-	m_lock.unlock();
-}
-
-/** Disconnects the user callback function if connected earlier.
- * \param[in] pfn - address of a function to remove
- */
-void callback1::disconnect(PFNCALLBACKPROC1 pfn)
-{
-	m_lock.lock();
-	for (std::list<_CALLBACKDATA1>::iterator it=m_lCalls.begin();it != m_lCalls.end();it++)
-	{
-		if ( (*it).pfn == pfn )
-		{
-			m_lCalls.erase(it);
-			m_lock.unlock();
-			return;
-		}
-	}
-	m_lock.unlock();
-}
-
-callback2::callback2()
-{
-	
-}
-
-callback2::~callback2()
-{
-	
-}
-
-/** Executes a callback list associated with this object.
- * \param[in] pData - first parameter that will be passed to a user callback function
- * \param[in] pData2 - second parameter that will be passed to a user callback function
- */
-void callback2::exec(ptr_t pData, ptr_t pData2)
-{
-	m_lock.lock();
-	try
-	{
-		for (std::list<_CALLBACKDATA2>::iterator it=m_lCalls.begin();it != m_lCalls.end();it++)
-			(*((*it).pfn))((*it).pParam, pData, pData2);
-		m_lock.unlock();
-	}
-	catch(...)
-	{
-		m_lock.unlock();
-		throw;
-	}
-}
-
-/** Connects a user callback function to this object.
- * \param[in] pfn - user callback function address
- * \param[in] pParam - user parameter to pass to the callback function when executing
- */
-void callback2::connect(PFNCALLBACKPROC2 pfn, ptr_t pParam)
-{
-	_CALLBACKDATA2 cd;
-	cd.pfn=pfn;
-	cd.pParam=pParam;
-
-	m_lock.lock();
-	m_lCalls.push_back(cd);
-	m_lock.unlock();
-}
-
-/** Disconnects the user callback function if connected earlier.
- * \param[in] pfn - address of a function to remove
- */
-void callback2::disconnect(PFNCALLBACKPROC2 pfn)
-{
-	m_lock.lock();
-	for (std::list<_CALLBACKDATA2>::iterator it=m_lCalls.begin();it != m_lCalls.end();it++)
-	{
-		if ( (*it).pfn == pfn )
-		{
-			m_lCalls.erase(it);
-			m_lock.unlock();
-			return;
-		}
-	}
-	m_lock.unlock();
-}
-
 END_ICPF_NAMESPACE