Index: src/libchcore/Tests/TSimpleOrderedBufferQueueTests.cpp
===================================================================
diff -u -N -rb051cbac8dac8c448507aa7c64753af9cf793af5 -r518d1a3484cde91ff17c071211df5e40cb3487e3
--- src/libchcore/Tests/TSimpleOrderedBufferQueueTests.cpp	(.../TSimpleOrderedBufferQueueTests.cpp)	(revision b051cbac8dac8c448507aa7c64753af9cf793af5)
+++ src/libchcore/Tests/TSimpleOrderedBufferQueueTests.cpp	(.../TSimpleOrderedBufferQueueTests.cpp)	(revision 518d1a3484cde91ff17c071211df5e40cb3487e3)
@@ -11,8 +11,8 @@
 {
 	TSimpleOrderedBufferQueue queue;
 
-	EXPECT_EQ(0, queue.size());
-	EXPECT_EQ(true, queue.empty());
+	EXPECT_EQ(0, queue.GetCount());
+	EXPECT_EQ(true, queue.IsEmpty());
 	EXPECT_EQ(nullptr, queue.Peek());
 }
 
@@ -23,8 +23,8 @@
 
 	queue.Push(&buffer);
 
-	EXPECT_EQ(1, queue.size());
-	EXPECT_EQ(false, queue.empty());
+	EXPECT_EQ(1, queue.GetCount());
+	EXPECT_EQ(false, queue.IsEmpty());
 	EXPECT_EQ(&buffer, queue.Peek());
 }
 
@@ -45,21 +45,22 @@
 	queue.Push(&buffer);
 	EXPECT_EQ(&buffer, queue.Pop());
 
-	EXPECT_EQ(0, queue.size());
-	EXPECT_EQ(true, queue.empty());
+	EXPECT_EQ(0, queue.GetCount());
+	EXPECT_EQ(true, queue.IsEmpty());
 	EXPECT_EQ(nullptr, queue.Peek());
 }
 
 TEST(TSimpleOrderedBufferQueueTests, Clear)
 {
 	TSimpleOrderedBufferQueue queue;
 	TOverlappedDataBuffer buffer(1024, nullptr);
+	TBufferListPtr spEmptyBuffers(std::make_shared<TBufferList>());
 
 	queue.Push(&buffer);
-	queue.clear();
+	queue.ClearBuffers(spEmptyBuffers);
 
-	EXPECT_EQ(0, queue.size());
-	EXPECT_EQ(true, queue.empty());
+	EXPECT_EQ(0, queue.GetCount());
+	EXPECT_EQ(true, queue.IsEmpty());
 	EXPECT_EQ(nullptr, queue.Peek());
 }