diff --git a/Common/DefaultOptions.h b/Common/DefaultOptions.h
index 556257bdc20f9361ebc504316e34ba4edf6796d3..8ddc89ba47df62bfb6132c9ba9e62e936d70c5a4 100644
--- a/Common/DefaultOptions.h
+++ b/Common/DefaultOptions.h
@@ -1349,7 +1349,7 @@ StringXColor GeneralOptions_Color[] = {
     PACK_COLOR(0,   0,   0,   255),
     "Text color" },
   { F|O, "Axes" , opt_general_color_axes ,
-    PACK_COLOR(255, 255, 255,   255),
+    PACK_COLOR(255, 255, 255, 255),
     PACK_COLOR(128, 128, 128, 255),
     PACK_COLOR(0,   0,   0,   255),
     "Axes color" },
diff --git a/DataStr/avl.cpp b/DataStr/avl.cpp
index 4dbd20f9b1581432c0f8f758d569d47c4e4dfca7..4f01f2bba1a3fa08dffb4bd8a6c3b17a1e049e76 100644
--- a/DataStr/avl.cpp
+++ b/DataStr/avl.cpp
@@ -1,4 +1,4 @@
-// $Id: avl.cpp,v 1.7 2002-05-18 07:18:00 geuzaine Exp $
+// $Id: avl.cpp,v 1.8 2005-05-16 00:50:10 geuzaine Exp $
 
 /*
  * avl package
@@ -384,27 +384,27 @@ static int do_check_tree(avl_node *node,
     
     if (comp_height != node->height) {
         (void) printf("Bad height for %p: computed=%d stored=%d\n",
-            node, comp_height, node->height);
+		      (void*)node, comp_height, node->height);
         ++*error;
     }
 
     if (bal > 1 || bal < -1) {
         (void) printf("Out of balance at node %p, balance = %d\n", 
-            node, bal);
+		      (void*)node, bal);
         ++*error;
     }
 
     if (node->left != NIL(avl_node) && 
                     (*compar)(node->left->key, node->key) > 0) {
         (void) printf("Bad ordering between %p and %p", 
-            node, node->left);
+		      (void*)node, (void*)node->left);
         ++*error;
     }
     
     if (node->right != NIL(avl_node) && 
                     (*compar)(node->key, node->right->key) > 0) {
         (void) printf("Bad ordering between %p and %p", 
-            node, node->right);
+		      (void*)node, (void*)node->right);
         ++*error;
     }
 
diff --git a/Graphics/Geom.cpp b/Graphics/Geom.cpp
index 184f4959c4857afed4a51cf2a7a82a07776881d1..6830c1fa520b9b1b6e584c89b0080e4e1830919f 100644
--- a/Graphics/Geom.cpp
+++ b/Graphics/Geom.cpp
@@ -1,4 +1,4 @@
-// $Id: Geom.cpp,v 1.83 2005-05-15 01:44:26 geuzaine Exp $
+// $Id: Geom.cpp,v 1.84 2005-05-16 00:50:10 geuzaine Exp $
 //
 // Copyright (C) 1997-2005 C. Geuzaine, J.-F. Remacle
 //
@@ -332,7 +332,6 @@ void Draw_Polygonal_Surface(Surface * s)
   if(CTX.geom.surfaces) {
     if(CTX.geom.light) glEnable(GL_LIGHTING);
     glEnable(GL_POLYGON_OFFSET_FILL); // always!
-    int k = 0;    
 
     std::list<BDS_Triangle*>::iterator it  = s->bds->triangles.begin();
     std::list<BDS_Triangle*>::iterator ite = s->bds->triangles.end();
diff --git a/Graphics/gl2ps.cpp b/Graphics/gl2ps.cpp
index a88cb07be44b8df6464bc5a25e3fcb9562472acb..880cf294b6a4f0ee19a53534262b6d04081cec69 100644
--- a/Graphics/gl2ps.cpp
+++ b/Graphics/gl2ps.cpp
@@ -1,4 +1,4 @@
-/* $Id: gl2ps.cpp,v 1.95 2005-03-13 20:17:54 geuzaine Exp $ */
+/* $Id: gl2ps.cpp,v 1.96 2005-05-16 00:50:10 geuzaine Exp $ */
 /*
  * GL2PS, an OpenGL to PostScript Printing Library
  * Copyright (C) 1999-2005 Christophe Geuzaine <geuz@geuz.org>
@@ -483,7 +483,7 @@ static void gl2psListRealloc(GL2PSlist *list, GLint n)
   }
   if(n <= 0) return;
   if(!list->array){
-    list->nmax = ((n - 1) / list->incr + 1) * list->incr;
+    list->nmax = n;
     list->array = (char*)gl2psMalloc(list->nmax * list->size);
   }
   else{
@@ -1208,7 +1208,7 @@ static GLboolean gl2psLess(GLfloat f1, GLfloat f2)
 
 static void gl2psBuildBspTree(GL2PSbsptree *tree, GL2PSlist *primitives)
 {
-  GL2PSprimitive *prim, *frontprim, *backprim;
+  GL2PSprimitive *prim, *frontprim = NULL, *backprim = NULL;
   GL2PSlist *frontlist, *backlist;
   GLint i, index;
 
@@ -2819,11 +2819,11 @@ static void gl2psPrintPostScriptBeginViewport(GLint viewport[4])
                 "closepath fill\n",
                 rgba[0], rgba[1], rgba[2], 
                 x, y, x+w, y, x+w, y+h, x, y+h);
-    gl2psPrintf("newpath %d %d moveto %d %d lineto %d %d lineto %d %d lineto\n"
-                "closepath clip\n",
-                x, y, x+w, y, x+w, y+h, x, y+h);
   }
-
+  
+  gl2psPrintf("newpath %d %d moveto %d %d lineto %d %d lineto %d %d lineto\n"
+              "closepath clip\n",
+              x, y, x+w, y, x+w, y+h, x, y+h);
 }
 
 static GLint gl2psPrintPostScriptEndViewport(void)
@@ -4930,3 +4930,12 @@ GL2PSDLL_API GLint gl2psBlendFunc(GLenum sfactor, GLenum dfactor)
 
   return GL2PS_SUCCESS;
 }
+
+GL2PSDLL_API GLint gl2psSetOptions(GLint options)
+{
+  if(!gl2ps) return GL2PS_UNINITIALIZED;
+
+  gl2ps->options = options;
+
+  return GL2PS_SUCCESS;
+}
diff --git a/Graphics/gl2ps.h b/Graphics/gl2ps.h
index f5ac0e0fbee7a992a6338b8e10e953b73c95c382..39df00263e7382f97baae53c1bea9ccb87ea2c83 100644
--- a/Graphics/gl2ps.h
+++ b/Graphics/gl2ps.h
@@ -1,4 +1,4 @@
-/* $Id: gl2ps.h,v 1.57 2005-01-01 19:35:30 geuzaine Exp $ */
+/* $Id: gl2ps.h,v 1.58 2005-05-16 00:50:10 geuzaine Exp $ */
 /*
  * GL2PS, an OpenGL to PostScript Printing Library
  * Copyright (C) 1999-2005 Christophe Geuzaine <geuz@geuz.org>
@@ -158,6 +158,7 @@ GL2PSDLL_API GLint gl2psBeginPage(const char *title, const char *producer,
                                   GLint nr, GLint ng, GLint nb, GLint buffersize,
                                   FILE *stream, const char *filename);
 GL2PSDLL_API GLint gl2psEndPage(void);
+GL2PSDLL_API GLint gl2psSetOptions(GLint options);
 GL2PSDLL_API GLint gl2psBeginViewport(GLint viewport[4]);
 GL2PSDLL_API GLint gl2psEndViewport(void);
 GL2PSDLL_API GLint gl2psText(const char *str, const char *fontname, 
diff --git a/Mesh/BDS.cpp b/Mesh/BDS.cpp
index 8aa6f3631e5d5242f9b10f23838280f9d05ee015..ecca2e0ebfe9d777b2eb187dde1202fcad2ba567 100644
--- a/Mesh/BDS.cpp
+++ b/Mesh/BDS.cpp
@@ -114,12 +114,12 @@ void print_face (BDS_Triangle *t)
 {
     BDS_Point *pts[3];
     t->getNodes (pts); 
-    printf("face %p with nodes %d %d %d and edges %p (%d %d) %p (%d %d) %p (%d %d)\n",t,pts[0]->iD,pts[1]->iD,pts[2]->iD,
-	   t->e1,t->e1->p1->iD,t->e1->p2->iD,t->e2,t->e2->p1->iD,t->e2->p2->iD,t->e3,t->e3->p1->iD,t->e3->p2->iD);
+    printf("face %p with nodes %d %d %d and edges %p (%d %d) %p (%d %d) %p (%d %d)\n",(void*)t,pts[0]->iD,pts[1]->iD,pts[2]->iD,
+	   (void*)t->e1,t->e1->p1->iD,t->e1->p2->iD,(void*)t->e2,t->e2->p1->iD,t->e2->p2->iD,(void*)t->e3,t->e3->p1->iD,t->e3->p2->iD);
 }
 void print_edge (BDS_Edge *e)
 {
-    printf("edge %p with nodes %d %d ------------------\n",e,e->p1->iD,e->p2->iD);
+  printf("edge %p with nodes %d %d ------------------\n",(void*)e,e->p1->iD,e->p2->iD);
     printf("faces : \n ");
     for (int i=0;i<e->numfaces();++i)
 	print_face (e->faces(i));
@@ -1063,7 +1063,7 @@ void BDS_Mesh :: save_gmsh_format ( const char *filename )
 	std::set<BDS_Point*,PointLessThan>::iterator ite = points.end();
 	
 	fprintf(f,"$NOD\n");
-	fprintf(f,"%d\n",points.size());
+	fprintf(f,"%d\n",(int)points.size());
 	while(it!=ite)
 	{
 	    if ((*it)->g && (*it)->g->classif_degree == 0)nbModelVertex++;
@@ -1086,7 +1086,7 @@ void BDS_Mesh :: save_gmsh_format ( const char *filename )
 	    }
 	}
 	
-	fprintf(f,"%d\n",nbClasEdges+nbModelVertex+triangles.size());
+	fprintf(f,"%ld\n",nbClasEdges+nbModelVertex+triangles.size());
 	
 	int k=1;  
 	{
diff --git a/Mesh/Print_Mesh.cpp b/Mesh/Print_Mesh.cpp
index 9c9f46097d2d53d7b0859773cbdc63b851942a74..cc0e7ee4a3161578522ae26101f777d665d1af40 100644
--- a/Mesh/Print_Mesh.cpp
+++ b/Mesh/Print_Mesh.cpp
@@ -1,4 +1,4 @@
-// $Id: Print_Mesh.cpp,v 1.60 2005-02-28 23:57:59 geuzaine Exp $
+// $Id: Print_Mesh.cpp,v 1.61 2005-05-16 00:50:10 geuzaine Exp $
 //
 // Copyright (C) 1997-2005 C. Geuzaine, J.-F. Remacle
 //
@@ -583,7 +583,7 @@ void Print_Mesh_MSH(Mesh *M, FILE *fp)
   else if(CTX.mesh.msh_file_version == 2.0){
     fprintf(MSHFILE, "$MeshFormat\n");
     fprintf(MSHFILE, "%g %d %d\n", CTX.mesh.msh_file_version,
-	    LIST_FORMAT_ASCII, sizeof(double));
+	    LIST_FORMAT_ASCII, (int)sizeof(double));
     fprintf(MSHFILE, "$EndMeshFormat\n");
   }
   else{
diff --git a/Mesh/Simplex.cpp b/Mesh/Simplex.cpp
index e1054ab9dd38cab2e33b749ed36c28b37d635f28..295569a1660cce28e25b278e8fd55531369d82dc 100644
--- a/Mesh/Simplex.cpp
+++ b/Mesh/Simplex.cpp
@@ -1,4 +1,4 @@
-// $Id: Simplex.cpp,v 1.40 2005-03-30 19:17:07 geuzaine Exp $
+// $Id: Simplex.cpp,v 1.41 2005-05-16 00:50:10 geuzaine Exp $
 //
 // Copyright (C) 1997-2005 C. Geuzaine, J.-F. Remacle
 //
@@ -803,7 +803,7 @@ bool Simplex::SwapEdge(int iFac)
 bool Simplex::SwapFace(int iFac, List_T * newsimp, List_T * delsimp)
 {
   Simplex *s = S[iFac], *s1, *s2, *s3;
-  Vertex *o[2];
+  Vertex *o[2] = {NULL, NULL};
   int i;
 
   if(!s || s == &MyNewBoundary || !s->iEnt)
diff --git a/Netgen/libsrc/csg/gencyl.cpp b/Netgen/libsrc/csg/gencyl.cpp
index f07987973861372d2e0b77c811e98814581f5e07..01c893d4a38b5035cb636b232ee095017d5d668d 100644
--- a/Netgen/libsrc/csg/gencyl.cpp
+++ b/Netgen/libsrc/csg/gencyl.cpp
@@ -14,7 +14,7 @@ GeneralizedCylinder :: GeneralizedCylinder (ExplicitCurve2d & acrosssection,
   planee2 = ae2;
   planee3 = Cross (planee1, planee2);
   (*testout) << "Vecs = " << planee1 << " " << planee2 << " " << planee3 << endl;
-};
+}
   
 
 void GeneralizedCylinder :: Project (Point<3> & p) const
diff --git a/Netgen/libsrc/csg/meshsurf.cpp b/Netgen/libsrc/csg/meshsurf.cpp
index 178133007caecd5a1a534d98ffce3b329a497b6d..0a7d7c74a0e9438e7d3345df2d2dbfc287b729b5 100644
--- a/Netgen/libsrc/csg/meshsurf.cpp
+++ b/Netgen/libsrc/csg/meshsurf.cpp
@@ -167,12 +167,12 @@ PointBetween (const Point3d & p1, const Point3d & p2, double secpoint,
     }
 
   newp = hnewp;
-};
+}
 
 
 void RefinementSurfaces :: ProjectToSurface (Point<3> & p, int surfi)
 {
   if (surfi != -1)
     geometry.GetSurface (surfi) -> Project (p);
-};
+}
 }
diff --git a/Netgen/libsrc/general/mystring.hpp b/Netgen/libsrc/general/mystring.hpp
index 39851d1fad8d79f2a2ba7cca3760ab0e7cff6833..cd6639552c587be270ac33fb69b96782b75c64d0 100644
--- a/Netgen/libsrc/general/mystring.hpp
+++ b/Netgen/libsrc/general/mystring.hpp
@@ -202,7 +202,7 @@ inline ostream& operator << (ostream& os, const MyStr& s)
 inline void MyStr::SetToErrHandler(void (*Handler)())
 {
   ErrHandler = Handler;
-};
+}
 
 #endif
 
diff --git a/Netgen/libsrc/geom2d/geom2dmesh.cpp b/Netgen/libsrc/geom2d/geom2dmesh.cpp
index 09664da239102324e24df2c901c95a0e3785e08b..1b679bd3c0dd4f6294a0fda83478ee8821374ce7 100644
--- a/Netgen/libsrc/geom2d/geom2dmesh.cpp
+++ b/Netgen/libsrc/geom2d/geom2dmesh.cpp
@@ -50,6 +50,6 @@ namespace netgen
     newp = Point3d (p2d(0), p2d(1), 0);
     newgi.edgenr = ap1.edgenr;
     newgi.dist = ((1-secpoint)*ap1.dist+secpoint*ap2.dist);
-  };
+  }
 
 }
diff --git a/Netgen/libsrc/linalg/polynomial.cpp b/Netgen/libsrc/linalg/polynomial.cpp
index f947e0a19124088c132db8acd5dc995174a22e62..964dab9674ba2807ded067792837b4b66252c2c9 100644
--- a/Netgen/libsrc/linalg/polynomial.cpp
+++ b/Netgen/libsrc/linalg/polynomial.cpp
@@ -43,7 +43,7 @@ LinearPolynomial2V (double ac, double acx, double acy)
   c = ac;
   cx = acx;
   cy = acy;
-};
+}
 
 
 QuadraticPolynomial2V ::   
@@ -170,7 +170,7 @@ MaxUnitSquare ()
   //  (*testout) << maxv << endl;
   return maxv;
   */
-};
+}
 
 
 
diff --git a/Netgen/libsrc/meshing/bisect.cpp b/Netgen/libsrc/meshing/bisect.cpp
index 45d72b50d49ed29b2753232fb6ecf9d0ca6e52c0..c95a2f1421b5fa5449dbf5213c60ffa5a9107c86 100644
--- a/Netgen/libsrc/meshing/bisect.cpp
+++ b/Netgen/libsrc/meshing/bisect.cpp
@@ -2365,7 +2365,7 @@ void Refinement :: PointBetween (const Point3d & p1, const Point3d & p2, double
 void Refinement :: ProjectToSurface (Point<3> & p, int surfi)
 {
   cout << "Refinement :: ProjectToSurface    ERROR: no geometry set" << endl;
-};
+}
 
 
 }
diff --git a/Netgen/libsrc/meshing/curvedelems.cpp b/Netgen/libsrc/meshing/curvedelems.cpp
index bce489fc847f5dd6a4b1fad653583393c4f3eaf4..50fea32f555ebe69320c6710c49f0be0737df2c7 100644
--- a/Netgen/libsrc/meshing/curvedelems.cpp
+++ b/Netgen/libsrc/meshing/curvedelems.cpp
@@ -215,7 +215,7 @@ namespace netgen
 	    fdshape.SetSize( nfaceshapes );
 	    fddshape.SetSize ( nfaceshapes );
 	}
-    };
+    }
     
 
 
@@ -272,7 +272,7 @@ namespace netgen
 	    fshape.SetSize( nfaces * (maxfaceorder-1) * (maxfaceorder-1)); // number of face shape functions
 	    fdshape.SetSize( nfaces * (maxfaceorder-1) * (maxfaceorder-1));
 	}
-    };
+    }
     
     
 
diff --git a/Netgen/libsrc/meshing/geomsearch.cpp b/Netgen/libsrc/meshing/geomsearch.cpp
index 1b4641308ad946fac21af5d803058f3aef4b9181..1c37637816ed957e8c09ade4591063852ffb9877 100644
--- a/Netgen/libsrc/meshing/geomsearch.cpp
+++ b/Netgen/libsrc/meshing/geomsearch.cpp
@@ -7,7 +7,7 @@ namespace netgen
   GeomSearch3d :: GeomSearch3d() 
   {
     size.i1 = 0; size.i2 = 0; size.i3 = 0; 
-  };
+  }
 
   GeomSearch3d :: ~GeomSearch3d()
   {
diff --git a/Netgen/libsrc/meshing/hprefinement.hpp b/Netgen/libsrc/meshing/hprefinement.hpp
index 4537b41345ea470a692f686b564c35a692dae983..df1cc01e8e639d2e85756ae90095d5e15fd66b3e 100644
--- a/Netgen/libsrc/meshing/hprefinement.hpp
+++ b/Netgen/libsrc/meshing/hprefinement.hpp
@@ -178,7 +178,7 @@ enum HPREF_ELEMENT_TYPE {
   HP_HEX_1E_0V,
   HP_HEX_3E_0V,
 
-  HP_HEX_1F_0E_0V,
+  HP_HEX_1F_0E_0V
 };
 
 
diff --git a/Netgen/libsrc/meshing/meshing2.hpp b/Netgen/libsrc/meshing/meshing2.hpp
index e827a5419bf92b265bab4d40ff0010ef50509b3f..a68a095d5e3398de684f29ea4774f281a5261bf8 100644
--- a/Netgen/libsrc/meshing/meshing2.hpp
+++ b/Netgen/libsrc/meshing/meshing2.hpp
@@ -12,7 +12,7 @@
 enum MESHING2_RESULT
 {
   MESHING2_OK = 0,
-  MESHING2_GIVEUP = 1,
+  MESHING2_GIVEUP = 1
 };
 
 
diff --git a/Netgen/libsrc/meshing/meshtype.cpp b/Netgen/libsrc/meshing/meshtype.cpp
index 3ed65c58577d9cbc4d0f2530c9cad47cde0d50ff..e26a0b48ce71e8cc1916e58e872d63833fb19894 100644
--- a/Netgen/libsrc/meshing/meshtype.cpp
+++ b/Netgen/libsrc/meshing/meshtype.cpp
@@ -2226,7 +2226,7 @@ DebugParameters :: DebugParameters ()
   haltsegment = 0;
   haltsegmentp1 = 0;
   haltsegmentp2 = 0;
-};
+}
 
 
 
diff --git a/Netgen/libsrc/stlgeom/meshstlsurface.cpp b/Netgen/libsrc/stlgeom/meshstlsurface.cpp
index 4e50a908b4bfd7b9e2cff6b1ba0114d24ed1796e..5af12d7aa9977181bb0a11ffd9970ed13d06e9b7 100644
--- a/Netgen/libsrc/stlgeom/meshstlsurface.cpp
+++ b/Netgen/libsrc/stlgeom/meshstlsurface.cpp
@@ -1114,7 +1114,7 @@ PointBetween (const Point3d & p1, const Point3d & p2, double secpoint,
 void RefinementSTLGeometry :: ProjectToSurface (Point<3> & p, int surfi)
 {
   cout << "RefinementSTLGeometry :: ProjectToSurface not implemented!" << endl;
-};
+}
 
 
 void RefinementSTLGeometry :: ProjectToSurface (Point<3> & p, int surfi,
@@ -1124,7 +1124,7 @@ void RefinementSTLGeometry :: ProjectToSurface (Point<3> & p, int surfi,
   gi.trignum = geom.Project (p);
   //  if (!gi.trignum) 
   //    cout << "projectSTL failed" << endl;
-};
+}
 
  
 }
diff --git a/Netgen/libsrc/stlgeom/stlgeommesh.cpp b/Netgen/libsrc/stlgeom/stlgeommesh.cpp
index 00ce8fc001501b93823dce7985fe6080f13bd5ee..863019c04cf8180ba098f3ac8be20fc4e1e09aad 100644
--- a/Netgen/libsrc/stlgeom/stlgeommesh.cpp
+++ b/Netgen/libsrc/stlgeom/stlgeommesh.cpp
@@ -540,7 +540,7 @@ int STLGeometry :: FromPlane (const Point<2> & plainpoint,
 }
 
 int lasttrig;
-int STLGeometry :: LastTrig() const {return lasttrig;};
+int STLGeometry :: LastTrig() const {return lasttrig;}
 
 //project normal to tangential plane
 int STLGeometry :: Project(Point<3> & p3d) const
diff --git a/Netgen/libsrc/stlgeom/stlline.cpp b/Netgen/libsrc/stlgeom/stlline.cpp
index 792b1fcd430d280b57040455de755acedc90b044..0fe01967e66e4d1d78985a7edcc7650cc2f04b03 100644
--- a/Netgen/libsrc/stlgeom/stlline.cpp
+++ b/Netgen/libsrc/stlgeom/stlline.cpp
@@ -555,7 +555,7 @@ STLLine :: STLLine(const STLGeometry * ageometry)
 {
   geometry = ageometry;
   split = 0;
-};
+}
 
 int STLLine :: GetNS() const
 {
@@ -572,13 +572,13 @@ int STLLine :: GetLeftTrig(int nr) const
 {
   if (nr > lefttrigs.Size()) {PrintSysError("In STLLine::GetLeftTrig!!!"); return 0;}
   return lefttrigs.Get(nr);
-};
+}
 
 int STLLine :: GetRightTrig(int nr) const 
 {
   if (nr > righttrigs.Size()) {PrintSysError("In STLLine::GetRightTrig!!!"); return 0;}
   return righttrigs.Get(nr);
-};
+}
 
 double STLLine :: GetSegLen(const ARRAY<Point<3> >& ap, int nr) const
 {
diff --git a/Netgen/libsrc/stlgeom/stltool.cpp b/Netgen/libsrc/stlgeom/stltool.cpp
index 9513904bfafa6b654a4f1b7bc8fbc4302cf721f1..c19fed4ca09901b60a659444296fc108ddf37218 100644
--- a/Netgen/libsrc/stlgeom/stltool.cpp
+++ b/Netgen/libsrc/stlgeom/stltool.cpp
@@ -43,7 +43,7 @@ double GetDistFromLine(const Point<3> & lp1, const Point<3> & lp2,
   vn /= vnl;
   p = lp1 + (v1 * vn) * vn;
   return (pold - p).Length();
-};
+}
 
 double GetDistFromInfiniteLine(const Point<3>& lp1, const Point<3>& lp2, const Point<3>& p)
 {
@@ -60,7 +60,7 @@ double GetDistFromInfiniteLine(const Point<3>& lp1, const Point<3>& lp2, const P
     {
       return Cross (vn, v1).Length() / vnl;
     }
-};
+}
 
 
 
@@ -607,7 +607,7 @@ ostream& operator<<(ostream& os, const STLTriangle& t)
   os << t[2] << "]";
 
   return os;
-};
+}
 
 
 
diff --git a/Parser/OpenFile.cpp b/Parser/OpenFile.cpp
index eeeda7a4bdcb6b74000ffc6598d83561471f6594..7d7856dfb893baeccec470b347d353966dacd70e 100644
--- a/Parser/OpenFile.cpp
+++ b/Parser/OpenFile.cpp
@@ -1,4 +1,4 @@
-// $Id: OpenFile.cpp,v 1.78 2005-05-04 14:42:22 remacle Exp $
+// $Id: OpenFile.cpp,v 1.79 2005-05-16 00:50:11 geuzaine Exp $
 //
 // Copyright (C) 1997-2005 C. Geuzaine, J.-F. Remacle
 //
@@ -296,6 +296,7 @@ int MergeProblem(char *name, int warn_if_missing)
     THEM->bds->save_gmsh_format ( "2.msh" );
     BDS_To_Mesh (THEM);
     SetBoundingBox();
+    status = THEM->status;
   }
   else {
     fpos_t position;