From 0ee9210dd2779354c2dfe2e09264e4695a8aca65 Mon Sep 17 00:00:00 2001 From: cnr-isti-vclab Date: Tue, 27 Feb 2007 15:17:17 +0000 Subject: [PATCH] std::numeric_limits::max() -> (std::numeric_limits::max)() to avoid annoying misunderstaindings on msvc8 --- vcg/complex/trimesh/clean.h | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/vcg/complex/trimesh/clean.h b/vcg/complex/trimesh/clean.h index ac1893d8..c9e2e4ef 100644 --- a/vcg/complex/trimesh/clean.h +++ b/vcg/complex/trimesh/clean.h @@ -24,6 +24,9 @@ History $Log: not supported by cvs2svn $ +Revision 1.48 2007/01/11 10:12:19 cignoni +Removed useless and conflicting inclusion of face.h + Revision 1.47 2006/12/01 21:26:14 cignoni Corrected bug in the IsFFAdjacencyConsistent the Topology checking function. @@ -454,7 +457,7 @@ private: These functions can optionally take into account only the selected faces. */ template - static int RemoveFaceOutOfRangeAreaSel(MeshType& m, ScalarType MinAreaThr=0, ScalarType MaxAreaThr=std::numeric_limits::max()) + static int RemoveFaceOutOfRangeAreaSel(MeshType& m, ScalarType MinAreaThr=0, ScalarType MaxAreaThr=(std::numeric_limits::max)()) { FaceIterator fi; int count_fd = 0; @@ -475,7 +478,7 @@ private: return count_fd; } template - static int RemoveFaceOutOfRangeEdgeSel( MeshType& m, ScalarType MinEdgeThr=0, ScalarType MaxEdgeThr=std::numeric_limits::max()) + static int RemoveFaceOutOfRangeEdgeSel( MeshType& m, ScalarType MinEdgeThr=0, ScalarType MaxEdgeThr=(std::numeric_limits::max)()) { FaceIterator fi; int count_fd = 0; @@ -504,11 +507,11 @@ private: static int RemoveZeroAreaFace(MeshType& m) { return RemoveFaceOutOfRangeArea(m);} // Aliases for the functions that do not look at selection - static int RemoveFaceOutOfRangeArea(MeshType& m, ScalarType MinAreaThr=0, ScalarType MaxAreaThr=std::numeric_limits::max()) + static int RemoveFaceOutOfRangeArea(MeshType& m, ScalarType MinAreaThr=0, ScalarType MaxAreaThr=(std::numeric_limits::max)()) { return RemoveFaceOutOfRangeAreaSel(m,MinAreaThr,MaxAreaThr); } - static int RemoveFaceOutOfRangeEdge(MeshType& m, ScalarType MinEdgeThr=0, ScalarType MaxEdgeThr=std::numeric_limits::max()) + static int RemoveFaceOutOfRangeEdge(MeshType& m, ScalarType MinEdgeThr=0, ScalarType MaxEdgeThr=(std::numeric_limits::max)()) { return RemoveFaceOutOfRangeEdgeSel(m,MinEdgeThr,MaxEdgeThr); }