steven/TinySTL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug fix

Browse Source
This commit is contained in:
邹晓航
2014-09-24 13:12:04 +08:00
parent 1a4b2bf529
commit 92db966b0a
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
TinySTL/CircularBuffer.h
View File

@@ -68,7 +68,7 @@ namespace TinySTL{
T *start_; T *start_;
T *finish_; T *finish_;
int indexOfHead; int indexOfHead;
int indexOfTail; int indexOfTail;//the last position
typedef Alloc dataAllocator; typedef Alloc dataAllocator;
public: public:
@@ -78,6 +78,9 @@ namespace TinySTL{
template<class InputIterator> template<class InputIterator>
circular_buffer(InputIterator first, InputIterator last); circular_buffer(InputIterator first, InputIterator last);
bool full(){ return ((indexOfTail + 1) % N) == indexOfHead; }
bool empty(){ return indexOfHead == indexOfTail; }
//just for test //just for test
T *begin(){ return start_; } T *begin(){ return start_; }
T *end(){ return finish_; } T *end(){ return finish_; }
@@ -85,24 +88,28 @@ namespace TinySTL{
void allocateAndFillN(const int& n, const value_type& val){ void allocateAndFillN(const int& n, const value_type& val){
start_ = dataAllocator::allocate(N); start_ = dataAllocator::allocate(N);
finish_ = start_ + N; finish_ = start_ + N;
indexOfHead = indexOfTail = 0; indexOfHead = 0;
if (N <= n){ if (N <= n){
finish_ = TinySTL::uninitialized_fill_n(start_, N, val); finish_ = TinySTL::uninitialized_fill_n(start_, N, val);
indexOfTail = N - 1;
}else{//N > n }else{//N > n
finish_ = TinySTL::uninitialized_fill_n(start_, n, val); finish_ = TinySTL::uninitialized_fill_n(start_, n, val);
finish_ = TinySTL::uninitialized_fill_n(finish_, N - n, value_type()); finish_ = TinySTL::uninitialized_fill_n(finish_, N - n, value_type());
indexOfTail = n - 1;
} }
} }
template<class InputIterator> template<class InputIterator>
void allocateAndCopy(InputIterator first, InputIterator last){ void allocateAndCopy(InputIterator first, InputIterator last){
int n = last - first; int n = last - first;
start_ = dataAllocator::allocate(N); start_ = dataAllocator::allocate(N);
indexOfHead = indexOfTail = 0; indexOfHead = 0;
if (N <= n){ if (N <= n){
finish_ = TinySTL::uninitialized_copy(first, first + N, start_); finish_ = TinySTL::uninitialized_copy(first, first + N, start_);
indexOfTail = N - 1;
}else{//N > n }else{//N > n
finish_ = TinySTL::uninitialized_copy(first, last, start_); finish_ = TinySTL::uninitialized_copy(first, last, start_);
finish_ = TinySTL::uninitialized_fill_n(finish_, N - n, value_type()); finish_ = TinySTL::uninitialized_fill_n(finish_, N - n, value_type());
indexOfTail = n - 1;
} }
} }
}; };