Index: src/libchcore/TWriteBufferQueueWrapper.cpp
===================================================================
diff -u -N -r685d0da3259dd94327ee8d644a88c155585b8249 -ra1f5b3d99f2f175b102d81379698ea1f08e42cce
--- src/libchcore/TWriteBufferQueueWrapper.cpp	(.../TWriteBufferQueueWrapper.cpp)	(revision 685d0da3259dd94327ee8d644a88c155585b8249)
+++ src/libchcore/TWriteBufferQueueWrapper.cpp	(.../TWriteBufferQueueWrapper.cpp)	(revision a1f5b3d99f2f175b102d81379698ea1f08e42cce)
@@ -32,7 +32,7 @@
 
 		UpdateHasBuffers();
 
-		m_emptyBuffersQueueConnector = m_spDataQueue->GetNotifier().connect(boost::bind(&TWriteBufferQueueWrapper::UpdateHasBuffers, this, _1));
+		m_emptyBuffersQueueConnector = m_spDataQueue->GetNotifier().connect(boost::bind(&TWriteBufferQueueWrapper::UpdateHasBuffers, this));
 	}
 
 	TWriteBufferQueueWrapper::~TWriteBufferQueueWrapper()
@@ -45,7 +45,7 @@
 		if (!pBuffer)
 			throw TCoreException(eErr_InvalidPointer, L"pBuffer", LOCATION);
 
-		m_tClaimedQueue.Push(pBuffer);
+		m_tRetryBuffers.Push(pBuffer);
 		UpdateHasBuffers();
 	}
 
@@ -63,23 +63,23 @@
 
 	TOverlappedDataBuffer* TWriteBufferQueueWrapper::InternalPop()
 	{
-		const TOverlappedDataBuffer* pClaimedQueueBuffer = m_tClaimedQueue.Peek();
+		const TOverlappedDataBuffer* pClaimedQueueBuffer = m_tRetryBuffers.Peek();
 		if (!pClaimedQueueBuffer)
 			return m_spDataQueue->Pop();
 
 		const TOverlappedDataBuffer* pDataQueueBuffer = m_spDataQueue->Peek();
 		if (!pDataQueueBuffer)
-			return m_tClaimedQueue.Pop();
+			return m_tRetryBuffers.Pop();
 
 		if (pClaimedQueueBuffer->GetFilePosition() < pDataQueueBuffer->GetFilePosition())
-			return m_tClaimedQueue.Pop();
+			return m_tRetryBuffers.Pop();
 		else
 			return m_spDataQueue->Pop();
 	}
 
 	bool TWriteBufferQueueWrapper::IsBufferReady() const
 	{
-		return !m_tClaimedQueue.empty() || m_spDataQueue->HasPoppableBuffer();
+		return !m_tRetryBuffers.empty() || m_spDataQueue->HasPoppableBuffer();
 	}
 
 	size_t TWriteBufferQueueWrapper::GetCount() const
@@ -96,12 +96,4 @@
 	{
 		m_eventHasBuffers.SetEvent(IsBufferReady());
 	}
-
-	void TWriteBufferQueueWrapper::ReleaseBuffers(const TBufferListPtr& spBuffers)
-	{
-		if(!spBuffers)
-			throw TCoreException(eErr_InvalidArgument, L"spBuffers is NULL", LOCATION);
-		m_spDataQueue->ReleaseBuffers(spBuffers);
-		m_tClaimedQueue.ReleaseBuffers(spBuffers);
-	}
 }