boost/ublas
2
0
Fork 0
mirror of https://github.com/boostorg/ublas.git synced 2026-02-21 03:22:14 +00:00
Code Issues Projects Releases Wiki Activity

correct preconds for range,slice

Browse Source 
[SVN r24878]
This commit is contained in:
Michael Stevens
2004-09-02 19:31:10 +00:00
parent d92ce4367a
commit 8bdd63513e
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/boost/numeric/ublas/storage.hpp
View File

@@ -963,6 +963,7 @@ namespace boost { namespace numeric { namespace ublas {
BOOST_UBLAS_INLINE
range (size_type start, size_type stop):
start_ (start), size_ (stop - start) {
BOOST_UBLAS_CHECK (start_ <= stop, bad_index ());
}
BOOST_UBLAS_INLINE
@@ -984,7 +985,6 @@ namespace boost { namespace numeric { namespace ublas {
// Composition
BOOST_UBLAS_INLINE
range compose (const range &r) const {
BOOST_UBLAS_CHECK (r.start_ + r.size_ <= size_, bad_size ());
return range (start_ + r.start_, start_ + r.start_ + r.size_);
}
@@ -1186,12 +1186,12 @@ namespace boost { namespace numeric { namespace ublas {
// Composition
BOOST_UBLAS_INLINE
slice compose (const range &r) const {
BOOST_UBLAS_CHECK (r.start () + r.size () <= size_, bad_size ());
BOOST_UBLAS_CHECK (start_ >= stride_ * r.start (), bad_index ());
return slice (start_ + stride_ * r.start (), stride_, r.size ());
}
BOOST_UBLAS_INLINE
slice compose (const slice &s) const {
BOOST_UBLAS_CHECK (s.start_ + s.stride_ * (s.size_ - (s.size_ > 0)) <= size_, bad_size ());
BOOST_UBLAS_CHECK (start_ >= stride_ * s.start_, bad_index ());
return slice (start_ + stride_ * s.start_, stride_ * s.stride_, s.size_);
}