Commit 17bde919 authored by Davis King's avatar Davis King

Merge

parents 7ae702a4 3c5251bb
...@@ -227,8 +227,8 @@ namespace dlib ...@@ -227,8 +227,8 @@ namespace dlib
typedef row_major_layout layout_type; typedef row_major_layout layout_type;
}; };
template <long start, long inc_, long end> template <long start, long inc_, long end_>
class matrix_range_static_exp : public matrix_exp<matrix_range_static_exp<start,inc_,end> > class matrix_range_static_exp : public matrix_exp<matrix_range_static_exp<start,inc_,end_> >
{ {
public: public:
typedef typename matrix_traits<matrix_range_static_exp>::type type; typedef typename matrix_traits<matrix_range_static_exp>::type type;
...@@ -239,7 +239,7 @@ namespace dlib ...@@ -239,7 +239,7 @@ namespace dlib
const static long cost = matrix_traits<matrix_range_static_exp>::cost; const static long cost = matrix_traits<matrix_range_static_exp>::cost;
typedef typename matrix_traits<matrix_range_static_exp>::layout_type layout_type; typedef typename matrix_traits<matrix_range_static_exp>::layout_type layout_type;
const static long inc = (start <= end)?inc_:-inc_; const static long inc = (start <= end_)?inc_:-inc_;
matrix_range_static_exp ( matrix_range_static_exp (
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment