chibicitiberiu/rainmeter-studio
1
0
Fork 0
mirror of https://github.com/chibicitiberiu/rainmeter-studio.git synced 2024-02-24 04:33:31 +00:00
Code Issues Releases Wiki Activity

Calc: Rename round to round2 for VS2013 compatibility

Browse Source
This commit is contained in:
jsmorley 2013-12-23 01:53:47 -05:00
parent 47cf1ec899
commit 223231f96e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Common/MathParser.cpp
View File

@ -101,7 +101,7 @@ static double trunc2(double x);
static double rad(double deg); static double rad(double deg);
static double sgn(double x); static double sgn(double x);
static double neg(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[] = static Function g_Functions[] =
{ {
@ -118,7 +118,7 @@ static Function g_Functions[] =
{ L"trunc", &trunc2, 5 }, { L"trunc", &trunc2, 5 },
{ L"floor", &floor, 5 }, { L"floor", &floor, 5 },
{ L"ceil", &ceil, 4 }, { L"ceil", &ceil, 4 },
{ L"round", (SingleArgFunction)&round, 5 }, { L"round", (SingleArgFunction)&round2, 5 },
{ L"asin", &asin, 4 }, { L"asin", &asin, 4 },
{ L"acos", &acos, 4 }, { L"acos", &acos, 4 },
{ L"rad", &rad, 3 }, { L"rad", &rad, 3 },
@ -867,7 +867,7 @@ static double neg(double x)
} }
// "Advanced" round function; second argument - sharpness // "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; int sharpness;
if (paramcnt == 1) if (paramcnt == 1)