diff --git a/Makefile b/Makefile index decc93b9db31bc6df6ea1f4033d9499c273dcca6..b22343328552f7d4d9594a593eb6da10b6176e29 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.142 2001-08-30 08:05:36 geuzaine Exp $ +# $Id: Makefile,v 1.143 2001-08-30 08:57:09 geuzaine Exp $ GMSH_RELEASE = 1.24 @@ -312,7 +312,7 @@ linux_gcc-2.95: tag compile_linux_gcc-2.95 link_linux_gcc-2.95 strip_bin rpm: src mv $(GMSH_SRCRPM).tar.gz /usr/src/redhat/SOURCES rpm -bb utils/gmsh_fltk.spec - cp /usr/src/redhat/RPMS/i386/$(GMSH_SRCRPM)-1.i386.rpm . + cp /usr/src/redhat/RPMS/i386/$(GMSH_SRCRPM)-?.i386.rpm . cp /usr/src/redhat/BUILD/$(GMSH_SRCRPM)/gmsh-$(GMSH_RELEASE)-$(GMSH_UNAME).tgz . # diff --git a/Mesh/3D_Extrude.cpp b/Mesh/3D_Extrude.cpp index 2824f44fc723a11c20c2285705a27e9523c2c2df..4a510707865d5ed0830eae71e686ecf0cdc413a4 100644 --- a/Mesh/3D_Extrude.cpp +++ b/Mesh/3D_Extrude.cpp @@ -1,4 +1,4 @@ -// $Id: 3D_Extrude.cpp,v 1.44 2001-08-29 07:27:51 geuzaine Exp $ +// $Id: 3D_Extrude.cpp,v 1.45 2001-08-30 08:55:49 geuzaine Exp $ #include "Gmsh.h" #include "Numeric.h" @@ -812,7 +812,7 @@ void copy_mesh (Surface * from, Surface * to){ ep->Extrude (ep->mesh.NbLayer - 1, ep->mesh.NbElmLayer[ep->mesh.NbLayer - 1], vi[j]->Pos.X, vi[j]->Pos.Y, vi[j]->Pos.Z); if (Vertex_Bound && (pV = (Vertex **) Tree_PQuery (Vertex_Bound, &vi[j]))){ - Free_Vertex(&vi[j],0); + //Crash gcc2.95! Free_Vertex(&vi[j],0); vi[j] = *pV; } else{ diff --git a/Mesh/Vertex.cpp b/Mesh/Vertex.cpp index dcbd509b26a5958c4636aec5e8abc89e358b4c0e..2a55d5762fe009824037c95bd6abdd719ff8c2fa 100644 --- a/Mesh/Vertex.cpp +++ b/Mesh/Vertex.cpp @@ -1,4 +1,4 @@ -// $Id: Vertex.cpp,v 1.9 2001-08-15 08:16:30 geuzaine Exp $ +// $Id: Vertex.cpp,v 1.10 2001-08-30 08:55:49 geuzaine Exp $ #include "Gmsh.h" #include "Vertex.h" @@ -13,7 +13,9 @@ Vertex::Vertex (){ Pos.Z = 0.0; lc = 1.0; Mov = NULL; - ListSurf = ListCurves = Extruded_Points = NULL; + ListSurf = NULL; + ListCurves = NULL; + Extruded_Points = NULL; } Vertex::Vertex (double X, double Y, double Z, double l, double W){ @@ -24,7 +26,9 @@ Vertex::Vertex (double X, double Y, double Z, double l, double W){ w = W; lc = l; Mov = NULL; - ListSurf = ListCurves = Extruded_Points = NULL; + ListSurf = NULL; + ListCurves = NULL; + Extruded_Points = NULL; } void Vertex::norme (){