OrgLion-ML
/
dlib
mirror of https://github.com/davisking/dlib.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Made vector_to_matrix() work for std::vector objects that have non-default 

allocators.

--HG--
extra : convert_revision : svn%3Afdd8eb12-d10e-0410-9acb-85c331704f74/trunk%402224
This commit is contained in:
Davis King 2008-05-12 23:21:19 +00:00
parent db3f3c17ae
commit d617349959
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dlib/matrix/matrix_utilities.h
View File

@ -1338,13 +1338,14 @@ namespace dlib
// ---------------------------------------------------------------------------------------- // ----------------------------------------------------------------------------------------
template < template <
typename value_type typename value_type,
typename alloc
> >
const matrix_exp<matrix_std_vector_exp<std::vector<value_type> > > vector_to_matrix ( const matrix_exp<matrix_std_vector_exp<std::vector<value_type,alloc> > > vector_to_matrix (
const std::vector<value_type>& vector const std::vector<value_type,alloc>& vector
) )
{ {
typedef matrix_std_vector_exp<std::vector<value_type> > exp; typedef matrix_std_vector_exp<std::vector<value_type,alloc> > exp;
return matrix_exp<exp>(exp(vector)); return matrix_exp<exp>(exp(vector));
} }