fix pb with max template

Geo/OCC_Connect.cpp

@@ -56,12 +56,6 @@
 #include <BRepBuilderAPI_Transform.hxx>
 
 
-template <typename T>
-T max(T const &a, T const &b)
-{
-    return a<b? b:a;
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // Printing routines
 ////////////////////////////////////////////////////////////////////////////////
@@ -150,7 +144,7 @@ int OCC_Connect::SaveBRep(char const *name)
 	p.RemoveFirst()
     )
 	BB.Add(compound,p.First());
-    BRepTools::Write(compound,name);
+    BRepTools::Write(compound, (char*)name);
 }
 
 void OCC_Connect::Dump(ostream &out) const
@@ -600,7 +594,7 @@ void OCC_Connect::Intersect(BRep_Builder &BB, TopoDS_Shape &target,
             BRepExtrema_ExtPC distance(vertex,edge);
             if(!distance.IsDone())
                 continue;
-            double tolerance=max(BRep_Tool::Tolerance(edge),
+            double tolerance=std::max(BRep_Tool::Tolerance(edge),
 				      BRep_Tool::Tolerance(vertex));
             for(int i=1;i<=distance.NbExt();i++) {
                 if(distance.Value(i)<tolerance) {
@@ -652,7 +646,7 @@ void OCC_Connect::Intersect(BRep_Builder &BB, TopoDS_Shape &target,
             BRepExtrema_ExtPC distance(vertex,edge);
             if(!distance.IsDone())
                 continue;
-            double tolerance=max(BRep_Tool::Tolerance(edge),
+            double tolerance=std::max(BRep_Tool::Tolerance(edge),
 				      BRep_Tool::Tolerance(vertex));
             for(int i=1;i<=distance.NbExt();i++) {
                 if(distance.Value(i)<tolerance) {

Makefile

@@ -8,7 +8,7 @@ include variables
 GMSH_MAJOR_VERSION = 2
 GMSH_MINOR_VERSION = 3
 GMSH_PATCH_VERSION = 1
-GMSH_EXTRA_VERSION =
+GMSH_EXTRA_VERSION = "-cvs-20090520"
 
 GMSH_VERSION =\
   ${GMSH_MAJOR_VERSION}.${GMSH_MINOR_VERSION}.${GMSH_PATCH_VERSION}${GMSH_EXTRA_VERSION}