Skip to content
Snippets Groups Projects
Commit f71a9310 authored by Laurent Van Migroet's avatar Laurent Van Migroet
Browse files

Replaced fmax by std::max for msvc

parent c8245231
No related branches found
No related tags found
No related merge requests found
...@@ -295,8 +295,8 @@ vector<Pair<GFace*,GFace*> >* GeomMeshMatcher:: matchFaces(GModel* m1, GModel* m ...@@ -295,8 +295,8 @@ vector<Pair<GFace*,GFace*> >* GeomMeshMatcher:: matchFaces(GModel* m1, GModel* m
double score4 = fabs(geo_obb.getSize()[2]-mesh_obb.getSize()[2]); double score4 = fabs(geo_obb.getSize()[2]-mesh_obb.getSize()[2]);
if (fmax(fmax(score1,score2),fmax(score3,score4)) < best_score) { if (std::max(std::max(score1,score2),std::max(score3,score4)) < best_score) {
best_score = fmax(fmax(score1,score2),fmax(score3,score4)); best_score = std::max(std::max(score1,score2),std::max(score3,score4));
choice = (*candidate); choice = (*candidate);
} }
} }
...@@ -403,8 +403,8 @@ vector<Pair<GRegion*,GRegion*> >* GeomMeshMatcher:: matchRegions(GModel* m1, GMo ...@@ -403,8 +403,8 @@ vector<Pair<GRegion*,GRegion*> >* GeomMeshMatcher:: matchRegions(GModel* m1, GMo
double score4 = fabs(geo_obb.getSize()[2]-mesh_obb.getSize()[2]); double score4 = fabs(geo_obb.getSize()[2]-mesh_obb.getSize()[2]);
if (fmax(fmax(score1,score2),fmax(score3,score4)) < best_score) { if (std::max(std::max(score1,score2),std::max(score3,score4)) < best_score) {
best_score = fmax(fmax(score1,score2),fmax(score3,score4)); best_score = std::max(std::max(score1,score2),std::max(score3,score4));
choice = (*candidate); choice = (*candidate);
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment