From 2bcfbe4754a8ece3a026d8cd3a9cb6588aebe0a7 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Tue, 3 Jun 2008 12:42:35 +0000
Subject: [PATCH] *** empty log message ***
---
Parser/Gmsh.tab.cpp | 10 +++++-----
Parser/Gmsh.y | 14 +++++++-------
Parser/Gmsh.yy.cpp | 2 +-
3 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/Parser/Gmsh.tab.cpp b/Parser/Gmsh.tab.cpp
index 35519159de..ec86272af8 100644
--- a/Parser/Gmsh.tab.cpp
+++ b/Parser/Gmsh.tab.cpp
@@ -324,7 +324,7 @@
/* Copy the first part of user declarations. */
#line 1 "Gmsh.y"
-// $Id: Gmsh.tab.cpp,v 1.364 2008-05-06 21:11:48 geuzaine Exp $
+// $Id: Gmsh.tab.cpp,v 1.365 2008-06-03 12:42:29 geuzaine Exp $
//
// Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
//
@@ -386,9 +386,9 @@ static ExtrudeParams extr;
static gmshSurface *myGmshSurface = 0;
-static List_T *ViewValueList;
+static List_T *ViewValueList = 0;
static double ViewCoord[100];
-static int *ViewNumList, ViewCoordIdx;
+static int *ViewNumList = 0, ViewCoordIdx = 0;
#define MAX_RECUR_LOOPS 100
static int ImbricatedLoop = 0;
@@ -4032,9 +4032,9 @@ yyreduce:
yymsg(0, "Unknown element type '%s'", (yyvsp[(1) - (1)].c));
ViewValueList = 0; ViewNumList = 0;
}
- Free((yyvsp[(1) - (1)].c));
- ViewCoordIdx = 0;
#endif
+ ViewCoordIdx = 0;
+ Free((yyvsp[(1) - (1)].c));
;}
break;
diff --git a/Parser/Gmsh.y b/Parser/Gmsh.y
index 5056cc6527..e0d470c3fb 100644
--- a/Parser/Gmsh.y
+++ b/Parser/Gmsh.y
@@ -1,5 +1,5 @@
%{
-// $Id: Gmsh.y,v 1.313 2008-05-04 08:31:21 geuzaine Exp $
+// $Id: Gmsh.y,v 1.314 2008-06-03 12:42:35 geuzaine Exp $
//
// Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
//
@@ -61,9 +61,9 @@ static ExtrudeParams extr;
static gmshSurface *myGmshSurface = 0;
-static List_T *ViewValueList;
+static List_T *ViewValueList = 0;
static double ViewCoord[100];
-static int *ViewNumList, ViewCoordIdx;
+static int *ViewNumList = 0, ViewCoordIdx = 0;
#define MAX_RECUR_LOOPS 100
static int ImbricatedLoop = 0;
@@ -455,9 +455,9 @@ Element :
yymsg(0, "Unknown element type '%s'", $1);
ViewValueList = 0; ViewNumList = 0;
}
- Free($1);
- ViewCoordIdx = 0;
#endif
+ ViewCoordIdx = 0;
+ Free($1);
}
'(' ElementCoords ')'
{
@@ -1937,10 +1937,10 @@ Command :
// open simultaneously. The right solution would be of course
// to modify FunctionManager to reopen the files instead of
// using the FILE pointer, but hey, I'm lazy...
- Msg::Status(2, true, "Reading '%s'", tmpstring);
+ Msg::StatusBar(2, true, "Reading '%s'", tmpstring);
ParseFile(tmpstring, 0, 1);
SetBoundingBox();
- Msg::Status(2, true, "Read '%s'", tmpstring);
+ Msg::StatusBar(2, true, "Read '%s'", tmpstring);
}
else if(!strcmp($1, "Print")){
#if defined(HAVE_FLTK)
diff --git a/Parser/Gmsh.yy.cpp b/Parser/Gmsh.yy.cpp
index c53d20db2f..e25652238f 100644
--- a/Parser/Gmsh.yy.cpp
+++ b/Parser/Gmsh.yy.cpp
@@ -835,7 +835,7 @@ int gmsh_yy_flex_debug = 0;
char *gmsh_yytext;
#line 1 "Gmsh.l"
#line 2 "Gmsh.l"
-// $Id: Gmsh.yy.cpp,v 1.363 2008-05-04 08:31:21 geuzaine Exp $
+// $Id: Gmsh.yy.cpp,v 1.364 2008-06-03 12:42:35 geuzaine Exp $
//
// Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
//
--
GitLab