Commit 2e676635 authored by Jan Möbius's avatar Jan Möbius
Browse files

Merge branch 'Fix_VS2103' into 'master'

Fixes VS 2013 Builds.

Fixes VS 2013 Builds.
Please don't directly use master!

See merge request !17
parents bb9a2e85 90ee1e1f
Pipeline #3696 passed with stage
in 6 minutes and 41 seconds
...@@ -136,8 +136,8 @@ remove_dependent_linear_constraints_only_linear_equality( std::vector<NConstrain ...@@ -136,8 +136,8 @@ remove_dependent_linear_constraints_only_linear_equality( std::vector<NConstrain
gmm::copy( A.row(i), row); gmm::copy( A.row(i), row);
// iterate over column // iterate over column
typename gmm::linalg_traits<SVectorGMM>::const_iterator c_it = gmm::vect_const_begin(col); gmm::linalg_traits<SVectorGMM>::const_iterator c_it = gmm::vect_const_begin(col);
typename gmm::linalg_traits<SVectorGMM>::const_iterator c_end = gmm::vect_const_end(col); gmm::linalg_traits<SVectorGMM>::const_iterator c_end = gmm::vect_const_end(col);
for(; c_it != c_end; ++c_it) for(; c_it != c_end; ++c_it)
if( row_status[c_it.index()] == -1) // only process unvisited rows if( row_status[c_it.index()] == -1) // only process unvisited rows
...@@ -182,8 +182,8 @@ find_max_abs_coeff(SVectorGMM& _v) ...@@ -182,8 +182,8 @@ find_max_abs_coeff(SVectorGMM& _v)
unsigned int imax(0); unsigned int imax(0);
double vmax(0.0); double vmax(0.0);
typename gmm::linalg_traits<SVectorGMM>::const_iterator c_it = gmm::vect_const_begin(_v); gmm::linalg_traits<SVectorGMM>::const_iterator c_it = gmm::vect_const_begin(_v);
typename gmm::linalg_traits<SVectorGMM>::const_iterator c_end = gmm::vect_const_end(_v); gmm::linalg_traits<SVectorGMM>::const_iterator c_end = gmm::vect_const_end(_v);
for(; c_it != c_end; ++c_it) for(; c_it != c_end; ++c_it)
if(c_it.index() != n-1) if(c_it.index() != n-1)
...@@ -209,7 +209,7 @@ add_row_simultaneously( int _row_i, ...@@ -209,7 +209,7 @@ add_row_simultaneously( int _row_i,
CMatrixGMM& _cmat, CMatrixGMM& _cmat,
const double _eps ) const double _eps )
{ {
typedef typename gmm::linalg_traits<SVectorGMM>::const_iterator RIter; typedef gmm::linalg_traits<SVectorGMM>::const_iterator RIter;
RIter r_it = gmm::vect_const_begin(_row); RIter r_it = gmm::vect_const_begin(_row);
RIter r_end = gmm::vect_const_end(_row); RIter r_end = gmm::vect_const_end(_row);
......
Supports Markdown
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