Skip to content
Snippets Groups Projects
Commit 6be85d01 authored by Dmitri Naumov's avatar Dmitri Naumov Committed by Dmitri Naumov
Browse files

[MaL] Use std namespace.

parent 844d6081
No related branches found
No related tags found
No related merge requests found
...@@ -64,7 +64,7 @@ void CRSMatrixReordered::reorderMatrix(unsigned const*const op_perm, unsigned co ...@@ -64,7 +64,7 @@ void CRSMatrixReordered::reorderMatrix(unsigned const*const op_perm, unsigned co
delete[] pos; delete[] pos;
for (i = 0; i < size; ++i) for (i = 0; i < size; ++i)
BaseLib::quicksort(jAn, static_cast<size_t>(iAn[i]), static_cast<size_t>(iAn[i + 1]), An); BaseLib::quicksort(jAn, static_cast<std::size_t>(iAn[i]), static_cast<std::size_t>(iAn[i + 1]), An);
std::swap(iAn, _row_ptr); std::swap(iAn, _row_ptr);
std::swap(jAn, _col_idx); std::swap(jAn, _col_idx);
......
...@@ -34,12 +34,12 @@ double calcProjPntToLineAndDists(const double p[3], const double a[3], ...@@ -34,12 +34,12 @@ double calcProjPntToLineAndDists(const double p[3], const double a[3],
// compute projected point // compute projected point
double proj_pnt[3]; double proj_pnt[3];
for (size_t k(0); k < 3; k++) for (std::size_t k(0); k < 3; k++)
proj_pnt[k] = a[k] + lambda * v[k]; proj_pnt[k] = a[k] + lambda * v[k];
d0 = sqrt (sqrDist (proj_pnt, a)); d0 = std::sqrt (sqrDist (proj_pnt, a));
return sqrt (sqrDist (p, proj_pnt)); return std::sqrt (sqrDist (p, proj_pnt));
} }
double getAngle (const double p0[3], const double p1[3], const double p2[3]) double getAngle (const double p0[3], const double p1[3], const double p2[3])
...@@ -48,7 +48,7 @@ double getAngle (const double p0[3], const double p1[3], const double p2[3]) ...@@ -48,7 +48,7 @@ double getAngle (const double p0[3], const double p1[3], const double p2[3])
const double v1[3] = {p2[0]-p1[0], p2[1]-p1[1], p2[2]-p1[2]}; const double v1[3] = {p2[0]-p1[0], p2[1]-p1[1], p2[2]-p1[2]};
// apply Cauchy Schwarz inequality // apply Cauchy Schwarz inequality
return acos (scalarProduct<double,3> (v0,v1) / (sqrt(scalarProduct<double,3>(v0,v0)) * sqrt(scalarProduct<double,3>(v1,v1)))); return std::acos (scalarProduct<double,3> (v0,v1) / (std::sqrt(scalarProduct<double,3>(v0,v0)) * sqrt(scalarProduct<double,3>(v1,v1))));
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment