diff --git a/Fltk/GUI.cpp b/Fltk/GUI.cpp index e2d117b721e41bc635933b034407b97333fa6142..fa5ee9e45f7cf215244b845d9d329d33d26f34c2 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 f0649f86ce6f2cf27ac6f8eb96a87ee68dc0f4e0..c95bab445b6522c359ed86cf65d0c3555bf06949 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 a7cc2c10d660739daf876122e2605432e376e993..f4fa633cd3459f2dc7c879a41e96e70f30e407b8 100644 --- a/Parser/Gmsh.y +++ b/Parser/Gmsh.y @@ -2469,7 +2469,7 @@ RecombineAngle : } | tAFFECT FExpr { - $$ = $2; + $$ = (int)$2; } ;