重构

TinySTL/Detail/Vector.impl.h

@@ -0,0 +1,287 @@
+#ifndef _VECTOR_IMPL_H_
+#define _VECTOR_IMPL_H_
+
+namespace TinySTL{
+	//***********************<2A><><EFBFBD>죬<EFBFBD><ECA3AC><EFBFBD>ƣ<EFBFBD><C6A3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>***********************
+	template<class T, class Alloc>
+	vector<T, Alloc>::~vector(){
+		destroyAndDeallocateAll();
+	}
+	template<class T, class Alloc>
+	vector<T, Alloc>::vector(const size_type n){
+		allocateAndFillN(n, value_type());
+	}
+	template<class T, class Alloc>
+	vector<T, Alloc>::vector(const size_type n, const value_type& value){
+		allocateAndFillN(n, value);
+	}
+	template<class T, class Alloc>
+	template<class InputIterator>
+	vector<T, Alloc>::vector(InputIterator first, InputIterator last){
+		//<2F><><EFBFBD><EFBFBD>ָ<EFBFBD><D6B8><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ּ<EFBFBD><D6BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ĺ<EFBFBD><C4BA><EFBFBD>
+		vector_aux(first, last, typename std::is_integral<InputIterator>::type());
+	}
+	template<class T, class Alloc>
+	vector<T, Alloc>::vector(const vector& v){
+		allocateAndCopy(v.start_, v.finish_);
+	}
+	template<class T, class Alloc>
+	vector<T, Alloc>::vector(vector&& v){
+		start_ = v.start_;
+		finish_ = v.finish_;
+		endOfStorage_ = v.endOfStorage_;
+		v.start_ = v.finish_ = v.endOfStorage_ = 0;
+	}
+	template<class T, class Alloc>
+	vector<T, Alloc>& vector<T, Alloc>::operator = (const vector& v){
+		if (this != &v){
+			allocateAndCopy(v.start_, v.finish_);
+		}
+		return *this;
+	}
+	template<class T, class Alloc>
+	vector<T, Alloc>& vector<T, Alloc>::operator = (vector&& v){
+		if (this != &v){
+			destroyAndDeallocateAll();
+			start_ = v.start_;
+			finish_ = v.finish_;
+			endOfStorage_ = v.endOfStorage_;
+			v.start_ = v.finish_ = v.endOfStorage_ = 0;
+		}
+		return *this;
+	}
+	//*************<2A><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>******************************
+	template<class T, class Alloc>
+	void vector<T, Alloc>::resize(size_type n, value_type val = value_type()){
+		if (n < size()){
+			dataAllocator::destroy(start_ + n, finish_);
+			finish_ = start_ + n;
+		}
+		else if (n > size() && n <= capacity()){
+			auto lengthOfInsert = n - size();
+			finish_ = uninitialized_fill_n(finish_, lengthOfInsert, val);
+		}
+		else if (n > capacity()){
+			auto lengthOfInsert = n - size();
+			T *newStart = dataAllocator::allocate(getNewCapacity(lengthOfInsert));
+			T *newFinish = TinySTL::uninitialized_copy(begin(), end(), newStart);
+			newFinish = TinySTL::uninitialized_fill_n(newFinish, lengthOfInsert, val);
+
+			destroyAndDeallocateAll();
+			start_ = newStart;
+			finish_ = newFinish;
+			endOfStorage_ = start_ + n;
+		}
+	}
+	template<class T, class Alloc>
+	void vector<T, Alloc>::reserve(size_type n){
+		if (n <= capacity())
+			return;
+		T *newStart = dataAllocator::allocate(n);
+		T *newFinish = TinySTL::uninitialized_copy(begin(), end(), newStart);
+		destroyAndDeallocateAll();
+
+		start_ = newStart;
+		finish_ = newFinish;
+		endOfStorage_ = start_ + n;
+	}
+	//***************<2A>޸<EFBFBD><DEB8><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ز<EFBFBD><D8B2><EFBFBD>**************************
+	template<class T, class Alloc>
+	typename vector<T, Alloc>::iterator vector<T, Alloc>::erase(iterator position){
+		return erase(position, position + 1);
+	}
+	template<class T, class Alloc>
+	typename vector<T, Alloc>::iterator vector<T, Alloc>::erase(iterator first, iterator last){
+		//β<><CEB2><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+		difference_type lenOfTail = end() - last;
+		//ɾȥ<C9BE>Ķ<EFBFBD><C4B6><EFBFBD><EFBFBD><EFBFBD>Ŀ
+		difference_type lenOfRemoved = last - first;
+		finish_ = finish_ - lenOfRemoved;
+		for (; lenOfTail != 0; --lenOfTail){
+			auto temp = (last - lenOfRemoved);
+			*temp = *(last++);
+		}
+		return (first);
+	}
+	template<class T, class Alloc>
+	template<class InputIterator>
+	void vector<T, Alloc>::reallocateAndCopy(iterator position, InputIterator first, InputIterator last){
+		difference_type newCapacity = getNewCapacity(last - first);
+
+		T *newStart = dataAllocator::allocate(newCapacity);
+		T *newEndOfStorage = newStart + newCapacity;
+		T *newFinish = TinySTL::uninitialized_copy(begin(), position, newStart);
+		newFinish = TinySTL::uninitialized_copy(first, last, newFinish);
+		newFinish = TinySTL::uninitialized_copy(position, end(), newFinish);
+
+		destroyAndDeallocateAll();
+		start_ = newStart;
+		finish_ = newFinish;
+		endOfStorage_ = newEndOfStorage;
+	}
+	template<class T, class Alloc>
+	void vector<T, Alloc>::reallocateAndFillN(iterator position, const size_type& n, const value_type& val){
+		difference_type newCapacity = getNewCapacity(n);
+
+		T *newStart = dataAllocator::allocate(newCapacity);
+		T *newEndOfStorage = newStart + newCapacity;
+		T *newFinish = TinySTL::uninitialized_copy(begin(), position, newStart);
+		newFinish = TinySTL::uninitialized_fill_n(newFinish, n, val);
+		newFinish = TinySTL::uninitialized_copy(position, end(), newFinish);
+
+		destroyAndDeallocateAll();
+		start_ = newStart;
+		finish_ = newFinish;
+		endOfStorage_ = newEndOfStorage;
+	}
+	template<class T, class Alloc>
+	template<class InputIterator>
+	void vector<T, Alloc>::insert_aux(iterator position,
+		InputIterator first,
+		InputIterator last,
+		std::false_type){
+		difference_type locationLeft = endOfStorage_ - finish_; // the size of left storage
+		difference_type locationNeed = last - first;
+
+		if (locationLeft >= locationNeed){
+			iterator tempPtr = end() - 1;
+			for (; tempPtr - position >= 0; --tempPtr){//move the [position, finish_) back
+				*(tempPtr + locationNeed) = *tempPtr;
+			}
+			TinySTL::uninitialized_copy(first, last, position);
+			finish_ += locationNeed;
+		}
+		else{
+			reallocateAndCopy(position, first, last);
+		}
+	}
+	template<class T, class Alloc>
+	template<class Integer>
+	void vector<T, Alloc>::insert_aux(iterator position, Integer n, const value_type& value, std::true_type){
+		assert(n != 0);
+		difference_type locationLeft = endOfStorage_ - finish_; // the size of left storage
+		difference_type locationNeed = n;
+
+		if (locationLeft >= locationNeed){
+			auto tempPtr = end() - 1;
+			for (; tempPtr - position >= 0; --tempPtr){//move the [position, finish_) back
+				*(tempPtr + locationNeed) = *tempPtr;
+			}
+			TinySTL::uninitialized_fill_n(position, n, value);
+			finish_ += locationNeed;
+		}
+		else{
+			reallocateAndFillN(position, n, value);
+		}
+	}
+	template<class T, class Alloc>
+	template<class InputIterator>
+	void vector<T, Alloc>::insert(iterator position, InputIterator first, InputIterator last){
+		insert_aux(position, first, last, typename std::is_integral<InputIterator>::type());
+	}
+	template<class T, class Alloc>
+	void vector<T, Alloc>::insert(iterator position, const size_type& n, const value_type& val){
+		insert_aux(position, n, val, typename std::is_integral<size_type>::type());
+	}
+	template<class T, class Alloc>
+	typename vector<T, Alloc>::iterator vector<T, Alloc>::insert(iterator position, const value_type& val){
+		const auto index = position - begin();
+		insert(position, 1, val);
+		return begin() + index;
+	}
+	template<class T, class Alloc>
+	void vector<T, Alloc>::push_back(const value_type& value){
+		insert(end(), value);
+	}
+	//***********<2A>߼<EFBFBD><DFBC>Ƚϲ<C8BD><CFB2><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>*******************
+	template<class T, class Alloc>
+	bool vector<T, Alloc>::operator == (const vector& v)const{
+		if (size() != v.size()){
+			return false;
+		}
+		else{
+			auto ptr1 = start_;
+			auto ptr2 = v.start_;
+			for (; ptr1 != finish_ && ptr2 != v.finish_; ++ptr1, ++ptr2){
+				if (*ptr1 != *ptr2)
+					return false;
+			}
+			return true;
+		}
+	}
+	template<class T, class Alloc>
+	bool vector<T, Alloc>::operator != (const vector& v)const{
+		return !(*this == v);
+	}
+	template<class T, class Alloc>
+	bool operator == (const vector<T, Alloc>& v1, const vector<T, Alloc>& v2){
+		//return v1 == v2;
+		return v1.operator==(v2);
+	}
+	template<class T, class Alloc>
+	bool operator != (const vector<T, Alloc>& v1, const vector<T, Alloc>& v2){
+		return !(v1 == v2);
+	}
+	template<class T, class Alloc>
+	void vector<T, Alloc>::shrink_to_fit(){
+		dataAllocator::deallocate(finish_, endOfStorage_ - finish_);
+		endOfStorage_ = finish_;
+	}
+	template<class T, class Alloc>
+	void vector<T, Alloc>::clear(){
+		dataAllocator::destroy(start_, finish_);
+		finish_ = start_;
+	}
+	template<class T, class Alloc>
+	void vector<T, Alloc>::swap(vector& v){
+		if (this != &v){
+			TinySTL::swap(start_, v.start_);
+			TinySTL::swap(finish_, v.finish_);
+			TinySTL::swap(endOfStorage_, v.endOfStorage_);
+		}
+	}
+	template<class T, class Alloc>
+	void vector<T, Alloc>::pop_back(){
+		--finish_;
+		dataAllocator::destroy(finish_);
+	}
+	template<class T, class Alloc>
+	void vector<T, Alloc>::destroyAndDeallocateAll(){
+		if (capacity() != 0){
+			dataAllocator::destroy(start_, finish_);
+			dataAllocator::deallocate(start_, capacity());
+		}
+	}
+	template<class T, class Alloc>
+	void vector<T, Alloc>::allocateAndFillN(const size_type n, const value_type& value){
+		start_ = dataAllocator::allocate(n);
+		TinySTL::uninitialized_fill_n(start_, n, value);
+		finish_ = endOfStorage_ = start_ + n;
+	}
+	template<class T, class Alloc>
+	template<class InputIterator>
+	void vector<T, Alloc>::allocateAndCopy(InputIterator first, InputIterator last){
+		start_ = dataAllocator::allocate(last - first);
+		finish_ = TinySTL::uninitialized_copy(first, last, start_);
+		endOfStorage_ = finish_;
+	}
+	template<class T, class Alloc>
+	template<class InputIterator>
+	void vector<T, Alloc>::vector_aux(InputIterator first, InputIterator last, std::false_type){
+		allocateAndCopy(first, last);
+	}
+	template<class T, class Alloc>
+	template<class Integer>
+	void vector<T, Alloc>::vector_aux(Integer n, const value_type& value, std::true_type){
+		allocateAndFillN(n, value);
+	}
+	template<class T, class Alloc>
+	typename vector<T, Alloc>::size_type vector<T, Alloc>::getNewCapacity(size_type len)const{
+		size_type oldCapacity = endOfStorage_ - start_;
+		auto res = TinySTL::max(oldCapacity, len);
+		size_type newCapacity = (oldCapacity != 0 ? (oldCapacity + res) : len);
+		return newCapacity;
+	}
+}
+
+#endif

TinySTL/Vector.h

@@ -44,9 +44,7 @@ namespace TinySTL{
 		vector(vector&& v);
 		vector& operator = (const vector& v);
 		vector& operator = (vector&& v);
-		~vector(){ 
+		~vector();
-			destroyAndDeallocateAll();
-		}
 
 		//<2F>Ƚϲ<C8BD><CFB2><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 		bool operator == (const vector& v)const;
@@ -70,10 +68,7 @@ namespace TinySTL{
 		bool empty()const{ return start_ == finish_; }
 		void resize(size_type n, value_type val = value_type());
 		void reserve(size_type n);
-		void shrink_to_fit(){ 
+		void shrink_to_fit();
-			dataAllocator::deallocate(finish_, endOfStorage_ - finish_); 
-			endOfStorage_ = finish_;
-		}
 
 		//<2F><><EFBFBD><EFBFBD>Ԫ<EFBFBD><D4AA><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 		value_type& operator[](const difference_type i){ return *(begin() + i); }
@@ -83,22 +78,10 @@ namespace TinySTL{
 
 		//<2F>޸<EFBFBD><DEB8><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>صIJ<D8B5><C4B2><EFBFBD>
 		//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>е<EFBFBD><D0B5><EFBFBD><EFBFBD>ж<EFBFBD><D0B6><EFBFBD><EFBFBD><EFBFBD>ʹ<EFBFBD><CAB9><EFBFBD><EFBFBD><EFBFBD><EFBFBD>sizeΪ0<CEAA><30><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>еĿռ<C4BF>
-		void clear(){
+		void clear();
-			dataAllocator::destroy(start_, finish_);
+		void swap(vector& v);
-			finish_ = start_;
-		}
-		void swap(vector& v){
-			if (this != &v){
-				TinySTL::swap(start_, v.start_);
-				TinySTL::swap(finish_, v.finish_);
-				TinySTL::swap(endOfStorage_, v.endOfStorage_);
-			}
-		}
 		void push_back(const value_type& value);
-		void pop_back(){
+		void pop_back();
-			--finish_;
-			dataAllocator::destroy(finish_);
-		}
 		iterator insert(iterator position, const value_type& val);
 		void insert(iterator position, const size_type& n, const value_type& val);
 		template <class InputIterator>
@@ -109,32 +92,15 @@ namespace TinySTL{
 		//<2F><><EFBFBD><EFBFBD><EFBFBD>Ŀռ<C4BF><D5BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 		Alloc get_allocator(){ return dataAllocator; }
 	private:
-		void destroyAndDeallocateAll(){
+		void destroyAndDeallocateAll();
-			if (capacity() != 0){
+		void allocateAndFillN(const size_type n, const value_type& value);
-				dataAllocator::destroy(start_, finish_);
-				dataAllocator::deallocate(start_, capacity());
-			}
-		}
-		void allocateAndFillN(const size_type n, const value_type& value){
-			start_ = dataAllocator::allocate(n);
-			TinySTL::uninitialized_fill_n(start_, n, value);
-			finish_ = endOfStorage_ = start_ + n;
-		}
 		template<class InputIterator>
-		void allocateAndCopy(InputIterator first, InputIterator last){
+		void allocateAndCopy(InputIterator first, InputIterator last);
-			start_ = dataAllocator::allocate(last - first);
-			finish_ = TinySTL::uninitialized_copy(first, last, start_);
-			endOfStorage_ = finish_;
-		}
 
 		template<class InputIterator>
-		void vector_aux(InputIterator first, InputIterator last, std::false_type){
+		void vector_aux(InputIterator first, InputIterator last, std::false_type);
-			allocateAndCopy(first, last);
-		}
 		template<class Integer>
-		void vector_aux(Integer n, const value_type& value, std::true_type){
+		void vector_aux(Integer n, const value_type& value, std::true_type);
-			allocateAndFillN(n, value);
-		}
 		template<class InputIterator>
 		void insert_aux(iterator position, InputIterator first, InputIterator last, std::false_type);
 		template<class Integer>
@@ -142,232 +108,14 @@ namespace TinySTL{
 		template<class InputIterator>
 		void reallocateAndCopy(iterator position, InputIterator first, InputIterator last);
 		void reallocateAndFillN(iterator position, const size_type& n, const value_type& val);
-		size_type getNewCapacity(size_type len)const{
+		size_type getNewCapacity(size_type len)const;
-			size_type oldCapacity = endOfStorage_ - start_;
-			auto res = TinySTL::max(oldCapacity, len);
-			size_type newCapacity = (oldCapacity != 0 ? (oldCapacity + res) : len);
-			return newCapacity;
-		}
 	public:
 		template<class T, class Alloc>
 		friend bool operator == (const vector<T, Alloc>& v1, const vector<T, Alloc>& v2);
 		template<class T, class Alloc>
 		friend bool operator != (const vector<T, Alloc>& v1, const vector<T, Alloc>& v2);
 	};// end of class vector
-
-	//***********************<2A><><EFBFBD>죬<EFBFBD><ECA3AC><EFBFBD>ƣ<EFBFBD><C6A3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>***********************
-	template<class T, class Alloc>
-	vector<T, Alloc>::vector(const size_type n){
-		allocateAndFillN(n, value_type());
-	}
-	template<class T, class Alloc>
-	vector<T, Alloc>::vector(const size_type n, const value_type& value){
-		allocateAndFillN(n, value);
-	}
-	template<class T, class Alloc>
-	template<class InputIterator>
-	vector<T, Alloc>::vector(InputIterator first, InputIterator last){
-		//<2F><><EFBFBD><EFBFBD>ָ<EFBFBD><D6B8><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ּ<EFBFBD><D6BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ĺ<EFBFBD><C4BA><EFBFBD>
-		vector_aux(first, last, typename std::is_integral<InputIterator>::type());
-	}
-	template<class T, class Alloc>
-	vector<T, Alloc>::vector(const vector& v){
-		allocateAndCopy(v.start_, v.finish_);
-	}
-	template<class T, class Alloc>
-	vector<T, Alloc>::vector(vector&& v){
-		start_ = v.start_;
-		finish_ = v.finish_;
-		endOfStorage_ = v.endOfStorage_;
-		v.start_ = v.finish_ = v.endOfStorage_ = 0;
-	}
-	template<class T, class Alloc>
-	vector<T, Alloc>& vector<T, Alloc>::operator = (const vector& v){
-		if (this != &v){
-			allocateAndCopy(v.start_, v.finish_);
-		}
-		return *this;
-	}
-	template<class T, class Alloc>
-	vector<T, Alloc>& vector<T, Alloc>::operator = (vector&& v){
-		if (this != &v){
-			destroyAndDeallocateAll();
-			start_ = v.start_;
-			finish_ = v.finish_;
-			endOfStorage_ = v.endOfStorage_;
-			v.start_ = v.finish_ = v.endOfStorage_ = 0;
-		}
-		return *this;
-	}
-	//*************<2A><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>******************************
-	template<class T, class Alloc>
-	void vector<T, Alloc>::resize(size_type n, value_type val = value_type()){
-		if (n < size()){
-			dataAllocator::destroy(start_ + n, finish_);
-			finish_ = start_ + n;
-		}else if (n > size() && n <= capacity()){
-			auto lengthOfInsert = n - size();
-			finish_ = uninitialized_fill_n(finish_, lengthOfInsert, val);
-		}else if (n > capacity()){
-			auto lengthOfInsert = n - size();
-			T *newStart = dataAllocator::allocate(getNewCapacity(lengthOfInsert));
-			T *newFinish = TinySTL::uninitialized_copy(begin(), end(), newStart);
-			newFinish = TinySTL::uninitialized_fill_n(newFinish, lengthOfInsert, val);
-
-			destroyAndDeallocateAll();
-			start_ = newStart;
-			finish_ = newFinish;
-			endOfStorage_ = start_ + n;
-		}
-	}
-	template<class T, class Alloc>
-	void vector<T, Alloc>::reserve(size_type n){
-		if (n <= capacity())
-			return;
-		T *newStart = dataAllocator::allocate(n);
-		T *newFinish = TinySTL::uninitialized_copy(begin(), end(), newStart);
-		destroyAndDeallocateAll();
-
-		start_ = newStart;
-		finish_ = newFinish;
-		endOfStorage_ = start_ + n;
-	}
-	//***************<2A>޸<EFBFBD><DEB8><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ز<EFBFBD><D8B2><EFBFBD>**************************
-	template<class T,class Alloc>
-	typename vector<T, Alloc>::iterator vector<T, Alloc>::erase(iterator position){
-		return erase(position, position + 1);
-	}
-	template<class T, class Alloc>
-	typename vector<T, Alloc>::iterator vector<T, Alloc>::erase(iterator first, iterator last){
-		//β<><CEB2><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-		difference_type lenOfTail = end() - last;
-		//ɾȥ<C9BE>Ķ<EFBFBD><C4B6><EFBFBD><EFBFBD><EFBFBD>Ŀ
-		difference_type lenOfRemoved = last - first;
-		finish_ = finish_ - lenOfRemoved;
-		for (; lenOfTail != 0; --lenOfTail){
-			auto temp = (last - lenOfRemoved);
-			*temp = *(last++);
-		}
-		return (first);
-	}
-	template<class T, class Alloc>
-	template<class InputIterator>
-	void vector<T, Alloc>::reallocateAndCopy(iterator position, InputIterator first, InputIterator last){
-		difference_type newCapacity = getNewCapacity(last - first);
-
-		T *newStart = dataAllocator::allocate(newCapacity);
-		T *newEndOfStorage = newStart + newCapacity;
-		T *newFinish = TinySTL::uninitialized_copy(begin(), position, newStart);
-		newFinish = TinySTL::uninitialized_copy(first, last, newFinish);
-		newFinish = TinySTL::uninitialized_copy(position, end(), newFinish);
-
-		destroyAndDeallocateAll();
-		start_ = newStart;
-		finish_ = newFinish;
-		endOfStorage_ = newEndOfStorage;
-	}
-	template<class T, class Alloc>
-	void vector<T, Alloc>::reallocateAndFillN(iterator position, const size_type& n, const value_type& val){
-		difference_type newCapacity = getNewCapacity(n);
-
-		T *newStart = dataAllocator::allocate(newCapacity);
-		T *newEndOfStorage = newStart + newCapacity;
-		T *newFinish = TinySTL::uninitialized_copy(begin(), position, newStart);
-		newFinish = TinySTL::uninitialized_fill_n(newFinish, n, val);
-		newFinish = TinySTL::uninitialized_copy(position, end(), newFinish);
-
-		destroyAndDeallocateAll();
-		start_ = newStart;
-		finish_ = newFinish;
-		endOfStorage_ = newEndOfStorage;
-	}
-	template<class T, class Alloc>
-	template<class InputIterator>
-	void vector<T, Alloc>::insert_aux(iterator position,
-									InputIterator first, 
-									InputIterator last, 
-									std::false_type){
-		difference_type locationLeft = endOfStorage_ - finish_; // the size of left storage
-		difference_type locationNeed = last - first;
-
-		if (locationLeft >= locationNeed){
-			iterator tempPtr = end() - 1;
-			for (; tempPtr - position >= 0; --tempPtr){//move the [position, finish_) back
-				*(tempPtr + locationNeed) = *tempPtr;
-			}
-			TinySTL::uninitialized_copy(first, last, position);
-			finish_ += locationNeed;
-		}else{
-			reallocateAndCopy(position, first, last);
-		}
-	}
-	template<class T, class Alloc>
-	template<class Integer>
-	void vector<T, Alloc>::insert_aux(iterator position, Integer n, const value_type& value, std::true_type){
-		assert(n != 0);
-		difference_type locationLeft = endOfStorage_ - finish_; // the size of left storage
-		difference_type locationNeed = n;
-
-		if (locationLeft >= locationNeed){
-			auto tempPtr = end() - 1;
-			for (; tempPtr - position >= 0; --tempPtr){//move the [position, finish_) back
-				*(tempPtr + locationNeed) = *tempPtr;
-			}
-			TinySTL::uninitialized_fill_n(position, n, value);
-			finish_ += locationNeed;
-		}
-		else{
-			reallocateAndFillN(position, n, value);
-		}
-	}
-	template<class T, class Alloc>
-	template<class InputIterator>
-	void vector<T, Alloc>::insert(iterator position, InputIterator first, InputIterator last){
-		insert_aux(position, first, last, typename std::is_integral<InputIterator>::type());
-	}
-	template<class T, class Alloc>
-	void vector<T, Alloc>::insert(iterator position, const size_type& n, const value_type& val){
-		insert_aux(position, n, val, typename std::is_integral<size_type>::type());
-	}
-	template<class T, class Alloc>
-	typename vector<T, Alloc>::iterator vector<T, Alloc>::insert(iterator position, const value_type& val){
-		const auto index = position - begin();
-		insert(position, 1, val);
-		return begin() + index;
-	}
-	template<class T, class Alloc>
-	void vector<T, Alloc>::push_back(const value_type& value){
-		insert(end(), value);
-	}
-	//***********<2A>߼<EFBFBD><DFBC>Ƚϲ<C8BD><CFB2><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>*******************
-	template<class T, class Alloc>
-	bool vector<T, Alloc>::operator == (const vector& v)const{
-		if (size() != v.size()){
-			return false;
-		}
-		else{
-			auto ptr1 = start_;
-			auto ptr2 = v.start_;
-			for (; ptr1 != finish_ && ptr2 != v.finish_; ++ptr1, ++ptr2){
-				if (*ptr1 != *ptr2)
-					return false;
-			}
-			return true;
-		}
-	}
-	template<class T, class Alloc>
-	bool vector<T, Alloc>::operator != (const vector& v)const{
-		return !(*this == v);
-	}
-	template<class T, class Alloc>
-	bool operator == (const vector<T, Alloc>& v1, const vector<T, Alloc>& v2){
-		//return v1 == v2;
-		return v1.operator==(v2);
-	}
-	template<class T, class Alloc>
-	bool operator != (const vector<T, Alloc>& v1, const vector<T, Alloc>& v2){
-		return !(v1 == v2);
-	}
 }
 
+#include "Detail\Vector.impl.h"
 #endif