From 30dd0749b90c753aa762fba9376a5510288a07d6 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Thu, 6 Nov 2008 08:07:43 +0000
Subject: [PATCH] *** empty log message ***
---
Fltk/GUI.cpp | 6 +++---
Parser/Gmsh.tab.cpp | 2 +-
Parser/Gmsh.y | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Fltk/GUI.cpp b/Fltk/GUI.cpp
index e2d117b721..fa5ee9e45f 100644
--- a/Fltk/GUI.cpp
+++ b/Fltk/GUI.cpp
@@ -3976,7 +3976,7 @@ void GUI::create_field_window()
field_window->box(GMSH_WINDOW_BOX);
int x = WB;
int y = WB;
- int w = 1.5 * BB;
+ int w = (int)(1.5 * BB);
Fl_Menu_Button *new_field_btn = new Fl_Menu_Button(x, y, w, BH, "New");
FieldManager &fields = *GModel::current()->getFields();
std::map<std::string, FieldFactory*>::iterator it;
@@ -4023,8 +4023,8 @@ void GUI::create_field_window()
help_tab->end();
tabs->end();
field_editor_group->end();
- field_window->resizable(new Dummy_Box(1.5 * BB + 2 * WB, BH + 2 * WB,
- width - 3 * WB - 1.5 * BB, height - 3 * BH - 5 * WB));
+ field_window->resizable(new Dummy_Box((int)(1.5 * BB) + 2 * WB, BH + 2 * WB,
+ width - 3 * WB - (int)(1.5 * BB), height - 3 * BH - 5 * WB));
field_editor_group->resizable(tabs);
tabs->resizable(options_tab);
options_tab->resizable(new Dummy_Box(3 * BB + 4 * WB, BH + 2 * WB,
diff --git a/Parser/Gmsh.tab.cpp b/Parser/Gmsh.tab.cpp
index f0649f86ce..c95bab445b 100644
--- a/Parser/Gmsh.tab.cpp
+++ b/Parser/Gmsh.tab.cpp
@@ -6435,7 +6435,7 @@ yyreduce:
case 214:
#line 2471 "Gmsh.y"
{
- (yyval.i) = (yyvsp[(2) - (2)].d);
+ (yyval.i) = (int)(yyvsp[(2) - (2)].d);
;}
break;
diff --git a/Parser/Gmsh.y b/Parser/Gmsh.y
index a7cc2c10d6..f4fa633cd3 100644
--- a/Parser/Gmsh.y
+++ b/Parser/Gmsh.y
@@ -2469,7 +2469,7 @@ RecombineAngle :
}
| tAFFECT FExpr
{
- $$ = $2;
+ $$ = (int)$2;
}
;
--
GitLab