From 72f7c5a58207dac1938fca26a680852e53b014cd Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Sat, 7 Jun 2008 07:35:45 +0000
Subject: [PATCH] *** empty log message ***
---
Geo/OCCIncludes.h | 2 +-
Parser/Gmsh.tab.cpp | 4 ++--
Parser/Gmsh.y | 4 ++--
Parser/Gmsh.yy.cpp | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Geo/OCCIncludes.h b/Geo/OCCIncludes.h
index 077a464209..1a2d9fe6ff 100644
--- a/Geo/OCCIncludes.h
+++ b/Geo/OCCIncludes.h
@@ -25,7 +25,7 @@
#include <iostream>
using std::iostream;
-#if !defined(WIN32) || defined(__CYGWIN__)
+#if !defined(HAVE_NO_OCC_CONFIG_H)
#include "config.h"
#endif
diff --git a/Parser/Gmsh.tab.cpp b/Parser/Gmsh.tab.cpp
index ec86272af8..80acf7ec55 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.365 2008-06-03 12:42:29 geuzaine Exp $
+// $Id: Gmsh.tab.cpp,v 1.366 2008-06-07 07:35:41 geuzaine Exp $
//
// Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
//
@@ -4726,7 +4726,7 @@ yyreduce:
for(int i = 0; i < List_Nbr((yyvsp[(9) - (11)].l)); i++){
double id;
List_Read((yyvsp[(9) - (11)].l), i, &id);
- vl.push_back(id);
+ vl.push_back((int)id);
}
}
else
diff --git a/Parser/Gmsh.y b/Parser/Gmsh.y
index e0d470c3fb..057506e3c4 100644
--- a/Parser/Gmsh.y
+++ b/Parser/Gmsh.y
@@ -1,5 +1,5 @@
%{
-// $Id: Gmsh.y,v 1.314 2008-06-03 12:42:35 geuzaine Exp $
+// $Id: Gmsh.y,v 1.315 2008-06-07 07:35:45 geuzaine Exp $
//
// Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
//
@@ -1062,7 +1062,7 @@ Affectation :
for(int i = 0; i < List_Nbr($9); i++){
double id;
List_Read($9, i, &id);
- vl.push_back(id);
+ vl.push_back((int)id);
}
}
else
diff --git a/Parser/Gmsh.yy.cpp b/Parser/Gmsh.yy.cpp
index e25652238f..760764621c 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.364 2008-06-03 12:42:35 geuzaine Exp $
+// $Id: Gmsh.yy.cpp,v 1.365 2008-06-07 07:35:45 geuzaine Exp $
//
// Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
//
--
GitLab