Commit bfa4b3f2 authored by Davis King's avatar Davis King

Added the layout_type into the matrix_type typedef.

--HG--
extra : convert_revision : svn%3Afdd8eb12-d10e-0410-9acb-85c331704f74/trunk%402774
parent 876c77e4
...@@ -90,7 +90,7 @@ namespace dlib ...@@ -90,7 +90,7 @@ namespace dlib
const static long NC = matrix_traits<EXP>::NC; const static long NC = matrix_traits<EXP>::NC;
const static long cost = matrix_traits<EXP>::cost; const static long cost = matrix_traits<EXP>::cost;
typedef matrix<type,NR,NC,mem_manager_type> matrix_type; typedef matrix<type,NR,NC,mem_manager_type,layout_type> matrix_type;
typedef EXP exp_type; typedef EXP exp_type;
inline const type operator() ( inline const type operator() (
......
...@@ -58,7 +58,7 @@ namespace dlib ...@@ -58,7 +58,7 @@ namespace dlib
const static long cost = EXP::cost; const static long cost = EXP::cost;
const static long NR = EXP::NR; const static long NR = EXP::NR;
const static long NC = EXP::NC; const static long NC = EXP::NC;
typedef matrix<type,NR,NC, mem_manager_type> matrix_type; typedef matrix<type,NR,NC, mem_manager_type,layout_type> matrix_type;
typedef EXP exp_type; typedef EXP exp_type;
const type operator() ( const type operator() (
......
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