diff options
| author | William Joye <wjoye@cfa.harvard.edu> | 2016-07-14 20:17:21 (GMT) |
|---|---|---|
| committer | William Joye <wjoye@cfa.harvard.edu> | 2016-07-14 20:17:21 (GMT) |
| commit | 86c202c439616781361e6ad16a4fbbdad1b21765 (patch) | |
| tree | 07da8d03f6f9fbdb02a67165ecddc000da9cff5a | |
| parent | 68ecdf467a98e212eea077052b49f8bde5cb940c (diff) | |
| download | blt-86c202c439616781361e6ad16a4fbbdad1b21765.zip blt-86c202c439616781361e6ad16a4fbbdad1b21765.tar.gz blt-86c202c439616781361e6ad16a4fbbdad1b21765.tar.bz2 | |
math function pointers in global space
| -rw-r--r-- | src/tkbltVecMath.C | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/tkbltVecMath.C b/src/tkbltVecMath.C index b13e92d..8dd5a5a 100644 --- a/src/tkbltVecMath.C +++ b/src/tkbltVecMath.C @@ -1480,19 +1480,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)::acos}, + {"asin", (void*)ComponentFunc, (ClientData)::asin}, + {"atan", (void*)ComponentFunc, (ClientData)::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)::ceil}, + {"cos", (void*)ComponentFunc, (ClientData)::cos}, + {"cosh", (void*)ComponentFunc, (ClientData)::cosh}, + {"exp", (void*)ComponentFunc, (ClientData)::exp}, + {"floor", (void*)ComponentFunc, (ClientData)::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)::log}, + {"log10", (void*)ComponentFunc, (ClientData)::log10}, {"max", (void*)ScalarFunc, (ClientData)Blt_VecMax}, {"mean", (void*)ScalarFunc, (ClientData)Mean}, {"median", (void*)ScalarFunc, (ClientData)Median}, @@ -1505,14 +1505,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)::sin}, + {"sinh", (void*)ComponentFunc, (ClientData)::sinh}, {"skew", (void*)ScalarFunc, (ClientData)Skew}, {"sort", (void*)VectorFunc, (ClientData)Sort}, - {"sqrt", (void*)ComponentFunc, (ClientData)sqrt}, + {"sqrt", (void*)ComponentFunc, (ClientData)::sqrt}, {"sum", (void*)ScalarFunc, (ClientData)Sum}, - {"tan", (void*)ComponentFunc, (ClientData)tan}, - {"tanh", (void*)ComponentFunc, (ClientData)tanh}, + {"tan", (void*)ComponentFunc, (ClientData)::tan}, + {"tanh", (void*)ComponentFunc, (ClientData)::tanh}, {"var", (void*)ScalarFunc, (ClientData)Variance}, {(char *)NULL,}, }; |