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-10-13 11:19:20 +08:00
parent c2128f214c
commit 0d06f741c4
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
TinySTL/CircularBuffer.h
View File

@@ -77,20 +77,24 @@ namespace TinySTL{
return index; return index;
} }
public: public:
friend cb_iter operator +(const cb_iter& cit, std::ptrdiff_t i); template<class T, size_t N, class Alloc>
friend cb_iter operator -(const cb_iter& cit, std::ptrdiff_t i); friend cb_iter<T, N, Alloc> operator +(const cb_iter<T, N, Alloc>& cit, std::ptrdiff_t i);
template<class T, size_t N, class Alloc>
friend cb_iter<T, N, Alloc> operator -(const cb_iter<T, N, Alloc>& cit, std::ptrdiff_t i);
}; };
template<class T, size_t N, class Alloc> template<class T, size_t N, class Alloc>
cb_iter<T, N, Alloc> operator +(const cb_iter<T, N, Alloc>& cit, std::ptrdiff_t i){ cb_iter<T, N, Alloc> operator +(const cb_iter<T, N, Alloc>& cit, std::ptrdiff_t i){
auto real_i = i % N; int real_i = i % (std::ptrdiff_t)N;//assume i >= 0
cb_iter<T, N, Alloc> res = *this; if (real_i < 0)
real_i += 5;
cb_iter<T, N, Alloc> res = cit;
res.setIndex_(res.index_ + real_i); res.setIndex_(res.index_ + real_i);
res.setPtr_(res.ptr_ + res.index_); res.setPtr_(res.ptr_ + res.index_);
return res; return res;
} }
template<class T, size_t N, class Alloc> template<class T, size_t N, class Alloc>
cb_iter<T, N, Alloc> operator -(const cb_iter<T, N, Alloc>& cit, std::ptrdiff_t i){ cb_iter<T, N, Alloc> operator -(const cb_iter<T, N, Alloc>& cit, std::ptrdiff_t i){
cb_iter<T, N, Alloc> res = *this; cb_iter<T, N, Alloc> res = cit;
return (res + (-i)); return (res + (-i));
} }
}//end of anonymous namespace }//end of anonymous namespace