summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorAdrián Medraño Calvo <adrian@medranocalvo.com>2017-07-21 09:28:20 (GMT)
committerAdrián Medraño Calvo <adrian@medranocalvo.com>2017-07-21 11:40:48 (GMT)
commit75db3cd1d501700e657da43148197665f71d7a70 (patch)
tree20bad48d78b8d13243ca8757a3c24ae19305ba54 /generic
parentf14d9dc7c790f40e897bf4f3afaacdde6509adac (diff)
downloadblt-75db3cd1d501700e657da43148197665f71d7a70.zip
blt-75db3cd1d501700e657da43148197665f71d7a70.tar.gz
blt-75db3cd1d501700e657da43148197665f71d7a70.tar.bz2
Fix polymorphic variant in jump table
Diffstat (limited to 'generic')
-rw-r--r--generic/tkbltVecMath.C30
1 files changed, 15 insertions, 15 deletions
diff --git a/generic/tkbltVecMath.C b/generic/tkbltVecMath.C
index 099f5f4..6e8a86e 100644
--- a/generic/tkbltVecMath.C
+++ b/generic/tkbltVecMath.C
@@ -1481,19 +1481,19 @@ static int VectorFunc(ClientData clientData, Tcl_Interp* interp, Vector *vPtr)
static MathFunction mathFunctions[] =
{
{"abs", (void*)ComponentFunc, (ClientData)Fabs},
- {"acos", (void*)ComponentFunc, (ClientData)acos},
- {"asin", (void*)ComponentFunc, (ClientData)asin},
- {"atan", (void*)ComponentFunc, (ClientData)atan},
+ {"acos", (void*)ComponentFunc, (ClientData)(double (*)(double))acos},
+ {"asin", (void*)ComponentFunc, (ClientData)(double (*)(double))asin},
+ {"atan", (void*)ComponentFunc, (ClientData)(double (*)(double))atan},
{"adev", (void*)ScalarFunc, (ClientData)AvgDeviation},
- {"ceil", (void*)ComponentFunc, (ClientData)ceil},
- {"cos", (void*)ComponentFunc, (ClientData)cos},
- {"cosh", (void*)ComponentFunc, (ClientData)cosh},
- {"exp", (void*)ComponentFunc, (ClientData)exp},
- {"floor", (void*)ComponentFunc, (ClientData)floor},
+ {"ceil", (void*)ComponentFunc, (ClientData)(double (*)(double))ceil},
+ {"cos", (void*)ComponentFunc, (ClientData)(double (*)(double))cos},
+ {"cosh", (void*)ComponentFunc, (ClientData)(double (*)(double))cosh},
+ {"exp", (void*)ComponentFunc, (ClientData)(double (*)(double))exp},
+ {"floor", (void*)ComponentFunc, (ClientData)(double (*)(double))floor},
{"kurtosis",(void*)ScalarFunc, (ClientData)Kurtosis},
{"length", (void*)ScalarFunc, (ClientData)Length},
- {"log", (void*)ComponentFunc, (ClientData)log},
- {"log10", (void*)ComponentFunc, (ClientData)log10},
+ {"log", (void*)ComponentFunc, (ClientData)(double (*)(double))log},
+ {"log10", (void*)ComponentFunc, (ClientData)(double (*)(double))log10},
{"max", (void*)ScalarFunc, (ClientData)Blt_VecMax},
{"mean", (void*)ScalarFunc, (ClientData)Mean},
{"median", (void*)ScalarFunc, (ClientData)Median},
@@ -1506,14 +1506,14 @@ static MathFunction mathFunctions[] =
{"random", (void*)ComponentFunc, (ClientData)drand48},
{"round", (void*)ComponentFunc, (ClientData)Round},
{"sdev", (void*)ScalarFunc, (ClientData)StdDeviation},
- {"sin", (void*)ComponentFunc, (ClientData)sin},
- {"sinh", (void*)ComponentFunc, (ClientData)sinh},
+ {"sin", (void*)ComponentFunc, (ClientData)(double (*)(double))sin},
+ {"sinh", (void*)ComponentFunc, (ClientData)(double (*)(double))sinh},
{"skew", (void*)ScalarFunc, (ClientData)Skew},
{"sort", (void*)VectorFunc, (ClientData)Sort},
- {"sqrt", (void*)ComponentFunc, (ClientData)sqrt},
+ {"sqrt", (void*)ComponentFunc, (ClientData)(double (*)(double))sqrt},
{"sum", (void*)ScalarFunc, (ClientData)Sum},
- {"tan", (void*)ComponentFunc, (ClientData)tan},
- {"tanh", (void*)ComponentFunc, (ClientData)tanh},
+ {"tan", (void*)ComponentFunc, (ClientData)(double (*)(double))tan},
+ {"tanh", (void*)ComponentFunc, (ClientData)(double (*)(double))tanh},
{"var", (void*)ScalarFunc, (ClientData)Variance},
{(char *)NULL,},
};