From 6c7a5b0d43b9fe9736e817da7233cbfe8d747ce4 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Thu, 26 Sep 2013 09:00:36 +0000
Subject: [PATCH] round(x) -> floor(x+0.5) as round() is not available in MSVC
---
Parser/Gmsh.tab.cpp | 4 ++--
Parser/Gmsh.y | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Parser/Gmsh.tab.cpp b/Parser/Gmsh.tab.cpp
index 11a26fb8c8..8583eb8825 100644
--- a/Parser/Gmsh.tab.cpp
+++ b/Parser/Gmsh.tab.cpp
@@ -9475,7 +9475,7 @@ yyreduce:
case 350:
#line 4301 "Gmsh.y"
- { (yyval.d) = round((yyvsp[(3) - (4)].d)); ;}
+ { (yyval.d) = floor((yyvsp[(3) - (4)].d) + 0.5); ;}
break;
case 351:
@@ -9585,7 +9585,7 @@ yyreduce:
case 372:
#line 4325 "Gmsh.y"
- { (yyval.d) = round((yyvsp[(3) - (4)].d)); ;}
+ { (yyval.d) = floor((yyvsp[(3) - (4)].d) + 0.5); ;}
break;
case 373:
diff --git a/Parser/Gmsh.y b/Parser/Gmsh.y
index 34d3f25eb4..07fe368ea1 100644
--- a/Parser/Gmsh.y
+++ b/Parser/Gmsh.y
@@ -4298,7 +4298,7 @@ FExpr :
| tFabs '(' FExpr ')' { $$ = fabs($3); }
| tFloor '(' FExpr ')' { $$ = floor($3); }
| tCeil '(' FExpr ')' { $$ = ceil($3); }
- | tRound '(' FExpr ')' { $$ = round($3); }
+ | tRound '(' FExpr ')' { $$ = floor($3 + 0.5); }
| tFmod '(' FExpr ',' FExpr ')' { $$ = fmod($3, $5); }
| tModulo '(' FExpr ',' FExpr ')' { $$ = fmod($3, $5); }
| tHypot '(' FExpr ',' FExpr ')' { $$ = sqrt($3 * $3 + $5 * $5); }
@@ -4322,7 +4322,7 @@ FExpr :
| tFabs '[' FExpr ']' { $$ = fabs($3); }
| tFloor '[' FExpr ']' { $$ = floor($3); }
| tCeil '[' FExpr ']' { $$ = ceil($3); }
- | tRound '[' FExpr ']' { $$ = round($3); }
+ | tRound '[' FExpr ']' { $$ = floor($3 + 0.5); }
| tFmod '[' FExpr ',' FExpr ']' { $$ = fmod($3, $5); }
| tModulo '[' FExpr ',' FExpr ']' { $$ = fmod($3, $5); }
| tHypot '[' FExpr ',' FExpr ']' { $$ = sqrt($3 * $3 + $5 * $5); }
--
GitLab