From 18b3119da26c71a0d5fb07cf270524731b674b05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=99=93=E8=88=AA?= <1210603696@qq.com>
Date: Wed, 24 Sep 2014 18:56:46 +0800
Subject: [PATCH] bug fix

---
 TinySTL/CircularBuffer.h | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/TinySTL/CircularBuffer.h b/TinySTL/CircularBuffer.h
index a3a6630..12f5334 100644
--- a/TinySTL/CircularBuffer.h
+++ b/TinySTL/CircularBuffer.h
@@ -117,8 +117,6 @@ namespace TinySTL{
 
 		typedef Alloc dataAllocator;
 	public:
-		circular_buffer() :
-			start_(0), finish_(0), indexOfHead(0), indexOfTail(0), size_(0){}
 		explicit circular_buffer(const int& n, const value_type& val = value_type());
 		template<class InputIterator>
 		circular_buffer(InputIterator first, InputIterator last);
@@ -148,8 +146,8 @@ namespace TinySTL{
 		reference operator [](size_type i){ return *(start_ + i); }
 		reference front(){ return *(start_ + indexOfHead); }
 		reference back(){ return *(start_ + indexOfTail); }
-		void push(const T& val);
-		void pop();
+		void push_back(const T& val);
+		void pop_front();
 
 		bool operator == (circular_buffer& cb){
 			auto it1 = first(), it2 = cb.first();
@@ -257,7 +255,7 @@ namespace TinySTL{
 	}
 	//************²åÈ룬ɾ³ýÏà¹Ø***********************
 	template<class T, size_t N, class Alloc>
-	void circular_buffer<T, N, Alloc>::push(const T& val){
+	void circular_buffer<T, N, Alloc>::push_back(const T& val){
 		if (full()){
 			indexOfTail = nextIndex(indexOfTail);
 			dataAllocator::construct(start_ + indexOfTail, val);
@@ -269,7 +267,7 @@ namespace TinySTL{
 		}
 	}
 	template<class T, size_t N, class Alloc>
-	void circular_buffer<T, N, Alloc>::pop(){
+	void circular_buffer<T, N, Alloc>::pop_front(){
 		if (empty())
 			throw;
 		dataAllocator::destroy(start_ + indexOfHead);