Commit d6173499 authored by Davis King's avatar Davis King

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
parent db3f3c17
......@@ -1338,13 +1338,14 @@ namespace dlib
// ----------------------------------------------------------------------------------------
template <
typename value_type
typename value_type,
typename alloc
>
const matrix_exp<matrix_std_vector_exp<std::vector<value_type> > > vector_to_matrix (
const std::vector<value_type>& vector
const matrix_exp<matrix_std_vector_exp<std::vector<value_type,alloc> > > vector_to_matrix (
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));
}
......
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