std::numeric_limits<ScalarType>::max() -> (std::numeric_limits<ScalarType>::max)()

to avoid annoying misunderstaindings on msvc8
This commit is contained in:
Paolo Cignoni 2007-02-27 15:17:17 +00:00
parent 4e3c3c110e
commit 0ee9210dd2
1 changed files with 7 additions and 4 deletions

View File

@ -24,6 +24,9 @@
History History
$Log: not supported by cvs2svn $ $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 Revision 1.47 2006/12/01 21:26:14 cignoni
Corrected bug in the IsFFAdjacencyConsistent the Topology checking function. 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. These functions can optionally take into account only the selected faces.
*/ */
template<bool Selected> template<bool Selected>
static int RemoveFaceOutOfRangeAreaSel(MeshType& m, ScalarType MinAreaThr=0, ScalarType MaxAreaThr=std::numeric_limits<ScalarType>::max()) static int RemoveFaceOutOfRangeAreaSel(MeshType& m, ScalarType MinAreaThr=0, ScalarType MaxAreaThr=(std::numeric_limits<ScalarType>::max)())
{ {
FaceIterator fi; FaceIterator fi;
int count_fd = 0; int count_fd = 0;
@ -475,7 +478,7 @@ private:
return count_fd; return count_fd;
} }
template<bool Selected> template<bool Selected>
static int RemoveFaceOutOfRangeEdgeSel( MeshType& m, ScalarType MinEdgeThr=0, ScalarType MaxEdgeThr=std::numeric_limits<ScalarType>::max()) static int RemoveFaceOutOfRangeEdgeSel( MeshType& m, ScalarType MinEdgeThr=0, ScalarType MaxEdgeThr=(std::numeric_limits<ScalarType>::max)())
{ {
FaceIterator fi; FaceIterator fi;
int count_fd = 0; int count_fd = 0;
@ -504,11 +507,11 @@ private:
static int RemoveZeroAreaFace(MeshType& m) { return RemoveFaceOutOfRangeArea(m);} static int RemoveZeroAreaFace(MeshType& m) { return RemoveFaceOutOfRangeArea(m);}
// Aliases for the functions that do not look at selection // Aliases for the functions that do not look at selection
static int RemoveFaceOutOfRangeArea(MeshType& m, ScalarType MinAreaThr=0, ScalarType MaxAreaThr=std::numeric_limits<ScalarType>::max()) static int RemoveFaceOutOfRangeArea(MeshType& m, ScalarType MinAreaThr=0, ScalarType MaxAreaThr=(std::numeric_limits<ScalarType>::max)())
{ {
return RemoveFaceOutOfRangeAreaSel<false>(m,MinAreaThr,MaxAreaThr); return RemoveFaceOutOfRangeAreaSel<false>(m,MinAreaThr,MaxAreaThr);
} }
static int RemoveFaceOutOfRangeEdge(MeshType& m, ScalarType MinEdgeThr=0, ScalarType MaxEdgeThr=std::numeric_limits<ScalarType>::max()) static int RemoveFaceOutOfRangeEdge(MeshType& m, ScalarType MinEdgeThr=0, ScalarType MaxEdgeThr=(std::numeric_limits<ScalarType>::max)())
{ {
return RemoveFaceOutOfRangeEdgeSel<false>(m,MinEdgeThr,MaxEdgeThr); return RemoveFaceOutOfRangeEdgeSel<false>(m,MinEdgeThr,MaxEdgeThr);
} }