From 223231f96e32a299d5e61eea04c8d94340b5144c Mon Sep 17 00:00:00 2001 From: jsmorley Date: Mon, 23 Dec 2013 01:53:47 -0500 Subject: [PATCH] Calc: Rename round to round2 for VS2013 compatibility --- Common/MathParser.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Common/MathParser.cpp b/Common/MathParser.cpp index 1d34d815..54beb50f 100644 --- a/Common/MathParser.cpp +++ b/Common/MathParser.cpp @@ -101,7 +101,7 @@ static double trunc2(double x); static double rad(double deg); static double sgn(double x); static double neg(double x); -static const WCHAR* round(int paramcnt, double* args, double* result); +static const WCHAR* round2(int paramcnt, double* args, double* result); static Function g_Functions[] = { @@ -118,7 +118,7 @@ static Function g_Functions[] = { L"trunc", &trunc2, 5 }, { L"floor", &floor, 5 }, { L"ceil", &ceil, 4 }, - { L"round", (SingleArgFunction)&round, 5 }, + { L"round", (SingleArgFunction)&round2, 5 }, { L"asin", &asin, 4 }, { L"acos", &acos, 4 }, { L"rad", &rad, 3 }, @@ -867,7 +867,7 @@ static double neg(double x) } // "Advanced" round function; second argument - sharpness -static const WCHAR* round(int paramcnt, double* args, double* result) +static const WCHAR* round2(int paramcnt, double* args, double* result) { int sharpness; if (paramcnt == 1)