diff --git a/MathLib/LinAlg/Sparse/NestedDissectionPermutation/CRSMatrixReordered.cpp b/MathLib/LinAlg/Sparse/NestedDissectionPermutation/CRSMatrixReordered.cpp index ba8314880ec55746fcbb4d05f3a377f8ce610f9f..2e32fb463de59fd8c869b76bde0c6f2fdebc7a36 100644 --- a/MathLib/LinAlg/Sparse/NestedDissectionPermutation/CRSMatrixReordered.cpp +++ b/MathLib/LinAlg/Sparse/NestedDissectionPermutation/CRSMatrixReordered.cpp @@ -64,7 +64,7 @@ void CRSMatrixReordered::reorderMatrix(unsigned const*const op_perm, unsigned co delete[] pos; 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(jAn, _col_idx); diff --git a/MathLib/MathTools.cpp b/MathLib/MathTools.cpp index 51ff3bb9fde0e23cc2ecbde493ff2fc627dc7fb1..9ff66e77ada39190272ef91a308f0b74da481d62 100644 --- a/MathLib/MathTools.cpp +++ b/MathLib/MathTools.cpp @@ -34,12 +34,12 @@ double calcProjPntToLineAndDists(const double p[3], const double a[3], // compute projected point 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]; - 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]) @@ -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]}; // 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)))); }