firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-23 22:03:03 +01:00
Code Issues

Remove macro needed for VC6 only.

Browse Source
This commit is contained in:
robocop 2009-04-07 12:48:16 +00:00
parent c71fcf7ac7
commit bfda334928
1 changed files with 52 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

105
src/jrd/SysFunction.cpp
View File

@ -3141,7 +3141,6 @@ dsc* evlUuidToChar(Jrd::thread_db* tdbb, const SysFunction* function, Jrd::jrd_n
} // anonymous namespace
#define SF(a, b, c, d, e, f, g) {a, b, c, d, e, f, g}
#ifdef _MSC_VER
typedef StdMathFunc VoidPtrStdMathFunc;
@ -3151,58 +3150,58 @@ typedef void* VoidPtrStdMathFunc;
const SysFunction SysFunction::functions[] =
{
SF("ABS", 1, 1, setParamsDouble, makeAbs, evlAbs, NULL),
SF("ACOS", 1, 1, setParamsDouble, makeDoubleResult, evlStdMath, (VoidPtrStdMathFunc) acos),
SF("ASCII_CHAR", 1, 1, setParamsInteger, makeAsciiChar, evlAsciiChar, NULL),
SF("ASCII_VAL", 1, 1, setParamsAsciiVal, makeShortResult, evlAsciiVal, NULL),
SF("ASIN", 1, 1, setParamsDouble, makeDoubleResult, evlStdMath, (VoidPtrStdMathFunc) asin),
SF("ATAN", 1, 1, setParamsDouble, makeDoubleResult, evlStdMath, (VoidPtrStdMathFunc) atan),
SF("ATAN2", 2, 2, setParamsDouble, makeDoubleResult, evlAtan2, NULL),
SF("BIN_AND", 2, -1, setParamsInteger, makeBin, evlBin, (void*) funBinAnd),
SF("BIN_NOT", 1, 1, setParamsInteger, makeBin, evlBin, (void*) funBinNot),
SF("BIN_OR", 2, -1, setParamsInteger, makeBin, evlBin, (void*) funBinOr),
SF("BIN_SHL", 2, 2, setParamsInteger, makeBinShift, evlBinShift, (void*) funBinShl),
SF("BIN_SHR", 2, 2, setParamsInteger, makeBinShift, evlBinShift, (void*) funBinShr),
SF("BIN_XOR", 2, -1, setParamsInteger, makeBin, evlBin, (void*) funBinXor),
SF("CEIL", 1, 1, setParamsDouble, makeCeilFloor, evlCeil, NULL),
SF("CEILING", 1, 1, setParamsDouble, makeCeilFloor, evlCeil, NULL),
SF("CHAR_TO_UUID", 1, 1, setParamsCharToUuid, makeUuid, evlCharToUuid, NULL),
SF("COS", 1, 1, setParamsDouble, makeDoubleResult, evlStdMath, (VoidPtrStdMathFunc) cos),
SF("COSH", 1, 1, setParamsDouble, makeDoubleResult, evlStdMath, (VoidPtrStdMathFunc) cosh),
SF("COT", 1, 1, setParamsDouble, makeDoubleResult, evlStdMath, (VoidPtrStdMathFunc) cot),
SF("DATEADD", 3, 3, setParamsDateAdd, makeDateAdd, evlDateAdd, NULL),
SF("DATEDIFF", 3, 3, setParamsDateDiff, makeInt64Result, evlDateDiff, NULL),
SF("EXP", 1, 1, setParamsDouble, makeDoubleResult, evlExp, NULL),
SF("FLOOR", 1, 1, setParamsDouble, makeCeilFloor, evlFloor, NULL),
SF("GEN_UUID", 0, 0, NULL, makeUuid, evlGenUuid, NULL),
SF("HASH", 1, 1, NULL, makeInt64Result, evlHash, NULL),
SF("LEFT", 2, 2, setParamsSecondInteger, makeLeftRight, evlLeft, NULL),
SF("LN", 1, 1, setParamsDouble, makeDoubleResult, evlLn, NULL),
SF("LOG", 2, 2, setParamsDouble, makeDoubleResult, evlLog, NULL),
SF("LOG10", 1, 1, setParamsDouble, makeDoubleResult, evlStdMath, (VoidPtrStdMathFunc) log10),
SF("LPAD", 2, 3, setParamsSecondInteger, makePad, evlPad, (void*) funLPad),
SF("MAXVALUE", 1, -1, setParamsFromList, makeFromListResult, evlMaxMinValue, (void*) funMaxValue),
SF("MINVALUE", 1, -1, setParamsFromList, makeFromListResult, evlMaxMinValue, (void*) funMinValue),
SF("MOD", 2, 2, setParamsFromList, makeMod, evlMod, NULL),
SF("OVERLAY", 3, 4, setParamsOverlay, makeOverlay, evlOverlay, NULL),
SF("PI", 0, 0, NULL, makeDoubleResult, evlPi, NULL),
SF("POSITION", 2, 3, setParamsPosition, makeLongResult, evlPosition, NULL),
SF("POWER", 2, 2, setParamsDouble, makeDoubleResult, evlPower, NULL),
SF("RAND", 0, 0, NULL, makeDoubleResult, evlRand, NULL),
SF("REPLACE", 3, 3, setParamsFromList, makeReplace, evlReplace, NULL),
SF("REVERSE", 1, 1, NULL, makeReverse, evlReverse, NULL),
SF("RIGHT", 2, 2, setParamsSecondInteger, makeLeftRight, evlRight, NULL),
SF("ROUND", 1, 2, setParamsRoundTrunc, makeRound, evlRound, NULL),
SF("RPAD", 2, 3, setParamsSecondInteger, makePad, evlPad, (void*) funRPad),
SF("SIGN", 1, 1, setParamsDouble, makeShortResult, evlSign, NULL),
SF("SIN", 1, 1, setParamsDouble, makeDoubleResult, evlStdMath, (VoidPtrStdMathFunc) sin),
SF("SINH", 1, 1, setParamsDouble, makeDoubleResult, evlStdMath, (VoidPtrStdMathFunc) sinh),
SF("SQRT", 1, 1, setParamsDouble, makeDoubleResult, evlSqrt, NULL),
SF("TAN", 1, 1, setParamsDouble, makeDoubleResult, evlStdMath, (VoidPtrStdMathFunc) tan),
SF("TANH", 1, 1, setParamsDouble, makeDoubleResult, evlStdMath, (VoidPtrStdMathFunc) tanh),
SF("TRUNC", 1, 2, setParamsRoundTrunc, makeTrunc, evlTrunc, NULL),
SF("UUID_TO_CHAR", 1, 1, setParamsUuidToChar, makeUuidToChar, evlUuidToChar, NULL),
SF("", 0, 0, NULL, NULL, NULL, NULL)
{"ABS", 1, 1, setParamsDouble, makeAbs, evlAbs, NULL},
{"ACOS", 1, 1, setParamsDouble, makeDoubleResult, evlStdMath, (VoidPtrStdMathFunc) acos},
{"ASCII_CHAR", 1, 1, setParamsInteger, makeAsciiChar, evlAsciiChar, NULL},
{"ASCII_VAL", 1, 1, setParamsAsciiVal, makeShortResult, evlAsciiVal, NULL},
{"ASIN", 1, 1, setParamsDouble, makeDoubleResult, evlStdMath, (VoidPtrStdMathFunc) asin},
{"ATAN", 1, 1, setParamsDouble, makeDoubleResult, evlStdMath, (VoidPtrStdMathFunc) atan},
{"ATAN2", 2, 2, setParamsDouble, makeDoubleResult, evlAtan2, NULL},
{"BIN_AND", 2, -1, setParamsInteger, makeBin, evlBin, (void*) funBinAnd},
{"BIN_NOT", 1, 1, setParamsInteger, makeBin, evlBin, (void*) funBinNot},
{"BIN_OR", 2, -1, setParamsInteger, makeBin, evlBin, (void*) funBinOr},
{"BIN_SHL", 2, 2, setParamsInteger, makeBinShift, evlBinShift, (void*) funBinShl},
{"BIN_SHR", 2, 2, setParamsInteger, makeBinShift, evlBinShift, (void*) funBinShr},
{"BIN_XOR", 2, -1, setParamsInteger, makeBin, evlBin, (void*) funBinXor},
{"CEIL", 1, 1, setParamsDouble, makeCeilFloor, evlCeil, NULL},
{"CEILING", 1, 1, setParamsDouble, makeCeilFloor, evlCeil, NULL},
{"CHAR_TO_UUID", 1, 1, setParamsCharToUuid, makeUuid, evlCharToUuid, NULL},
{"COS", 1, 1, setParamsDouble, makeDoubleResult, evlStdMath, (VoidPtrStdMathFunc) cos},
{"COSH", 1, 1, setParamsDouble, makeDoubleResult, evlStdMath, (VoidPtrStdMathFunc) cosh},
{"COT", 1, 1, setParamsDouble, makeDoubleResult, evlStdMath, (VoidPtrStdMathFunc) cot},
{"DATEADD", 3, 3, setParamsDateAdd, makeDateAdd, evlDateAdd, NULL},
{"DATEDIFF", 3, 3, setParamsDateDiff, makeInt64Result, evlDateDiff, NULL},
{"EXP", 1, 1, setParamsDouble, makeDoubleResult, evlExp, NULL},
{"FLOOR", 1, 1, setParamsDouble, makeCeilFloor, evlFloor, NULL},
{"GEN_UUID", 0, 0, NULL, makeUuid, evlGenUuid, NULL},
{"HASH", 1, 1, NULL, makeInt64Result, evlHash, NULL},
{"LEFT", 2, 2, setParamsSecondInteger, makeLeftRight, evlLeft, NULL},
{"LN", 1, 1, setParamsDouble, makeDoubleResult, evlLn, NULL},
{"LOG", 2, 2, setParamsDouble, makeDoubleResult, evlLog, NULL},
{"LOG10", 1, 1, setParamsDouble, makeDoubleResult, evlStdMath, (VoidPtrStdMathFunc) log10},
{"LPAD", 2, 3, setParamsSecondInteger, makePad, evlPad, (void*) funLPad},
{"MAXVALUE", 1, -1, setParamsFromList, makeFromListResult, evlMaxMinValue, (void*) funMaxValue},
{"MINVALUE", 1, -1, setParamsFromList, makeFromListResult, evlMaxMinValue, (void*) funMinValue},
{"MOD", 2, 2, setParamsFromList, makeMod, evlMod, NULL},
{"OVERLAY", 3, 4, setParamsOverlay, makeOverlay, evlOverlay, NULL},
{"PI", 0, 0, NULL, makeDoubleResult, evlPi, NULL},
{"POSITION", 2, 3, setParamsPosition, makeLongResult, evlPosition, NULL},
{"POWER", 2, 2, setParamsDouble, makeDoubleResult, evlPower, NULL},
{"RAND", 0, 0, NULL, makeDoubleResult, evlRand, NULL},
{"REPLACE", 3, 3, setParamsFromList, makeReplace, evlReplace, NULL},
{"REVERSE", 1, 1, NULL, makeReverse, evlReverse, NULL},
{"RIGHT", 2, 2, setParamsSecondInteger, makeLeftRight, evlRight, NULL},
{"ROUND", 1, 2, setParamsRoundTrunc, makeRound, evlRound, NULL},
{"RPAD", 2, 3, setParamsSecondInteger, makePad, evlPad, (void*) funRPad},
{"SIGN", 1, 1, setParamsDouble, makeShortResult, evlSign, NULL},
{"SIN", 1, 1, setParamsDouble, makeDoubleResult, evlStdMath, (VoidPtrStdMathFunc) sin},
{"SINH", 1, 1, setParamsDouble, makeDoubleResult, evlStdMath, (VoidPtrStdMathFunc) sinh},
{"SQRT", 1, 1, setParamsDouble, makeDoubleResult, evlSqrt, NULL},
{"TAN", 1, 1, setParamsDouble, makeDoubleResult, evlStdMath, (VoidPtrStdMathFunc) tan},
{"TANH", 1, 1, setParamsDouble, makeDoubleResult, evlStdMath, (VoidPtrStdMathFunc) tanh},
{"TRUNC", 1, 2, setParamsRoundTrunc, makeTrunc, evlTrunc, NULL},
{"UUID_TO_CHAR", 1, 1, setParamsUuidToChar, makeUuidToChar, evlUuidToChar, NULL},
{"", 0, 0, NULL, NULL, NULL, NULL}
};