From 6df07940f872252904776ab0ff6f57f4d1b59ae4 Mon Sep 17 00:00:00 2001 From: William Joye Date: Mon, 18 Jul 2016 14:21:01 -0400 Subject: fix for gcc-6 --- src/tkbltGrAxis.C | 3 ++- src/tkbltGrAxisOp.C | 3 ++- src/tkbltGrAxisOption.C | 3 ++- src/tkbltGrElem.C | 3 ++- src/tkbltGrElemBar.C | 3 ++- src/tkbltGrElemBar.h | 2 +- src/tkbltGrElemLine.C | 3 ++- src/tkbltGrElemLineSpline.C | 3 ++- src/tkbltGrElemOption.C | 3 ++- src/tkbltGrMarker.C | 3 ++- src/tkbltGrMarkerLine.C | 3 ++- src/tkbltGrMarkerText.C | 3 ++- src/tkbltGrMisc.C | 3 ++- src/tkbltGrPSOutput.C | 3 ++- src/tkbltGrText.C | 2 +- src/tkbltGraphSup.C | 3 ++- src/tkbltVecCmd.C | 3 ++- src/tkbltVecMath.C | 39 ++++++++++++++++++++------------------- src/tkbltVector.C | 3 ++- 19 files changed, 54 insertions(+), 37 deletions(-) diff --git a/src/tkbltGrAxis.C b/src/tkbltGrAxis.C index 430d13b..2d8dbfb 100644 --- a/src/tkbltGrAxis.C +++ b/src/tkbltGrAxis.C @@ -27,11 +27,12 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include #include #include #include +#include + #include "tkbltGraph.h" #include "tkbltGrBind.h" #include "tkbltGrAxis.h" diff --git a/src/tkbltGrAxisOp.C b/src/tkbltGrAxisOp.C index f5102a5..89b2be9 100644 --- a/src/tkbltGrAxisOp.C +++ b/src/tkbltGrAxisOp.C @@ -27,9 +27,10 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include #include +#include + #include "tkbltGrBind.h" #include "tkbltGraph.h" #include "tkbltGrAxis.h" diff --git a/src/tkbltGrAxisOption.C b/src/tkbltGrAxisOption.C index 7c396c6..d0f78e8 100644 --- a/src/tkbltGrAxisOption.C +++ b/src/tkbltGrAxisOption.C @@ -27,9 +27,10 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include #include +#include + #include "tkbltGraph.h" #include "tkbltGrAxis.h" #include "tkbltGrAxisOption.h" diff --git a/src/tkbltGrElem.C b/src/tkbltGrElem.C index 3591e85..c80cbc1 100644 --- a/src/tkbltGrElem.C +++ b/src/tkbltGrElem.C @@ -27,11 +27,12 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include #include #include #include +#include + #include "tkbltGraph.h" #include "tkbltGrBind.h" #include "tkbltGrElem.h" diff --git a/src/tkbltGrElemBar.C b/src/tkbltGrElemBar.C index 5f72c22..ad3099e 100644 --- a/src/tkbltGrElemBar.C +++ b/src/tkbltGrElemBar.C @@ -28,10 +28,11 @@ */ #include -#include #include #include +#include + #include "tkbltGraphBar.h" #include "tkbltGrElemBar.h" #include "tkbltGrElemOption.h" diff --git a/src/tkbltGrElemBar.h b/src/tkbltGrElemBar.h index 7e018af..9207a9f 100644 --- a/src/tkbltGrElemBar.h +++ b/src/tkbltGrElemBar.h @@ -30,7 +30,7 @@ #ifndef __BltGrElemBar_h__ #define __BltGrElemBar_h__ -#include +#include #include diff --git a/src/tkbltGrElemLine.C b/src/tkbltGrElemLine.C index 91e4c5b..8da4279 100644 --- a/src/tkbltGrElemLine.C +++ b/src/tkbltGrElemLine.C @@ -28,10 +28,11 @@ */ #include -#include #include #include +#include + #include "tkbltGraph.h" #include "tkbltGrElemLine.h" #include "tkbltGrElemOption.h" diff --git a/src/tkbltGrElemLineSpline.C b/src/tkbltGrElemLineSpline.C index 0e4c3d9..9224d53 100644 --- a/src/tkbltGrElemLineSpline.C +++ b/src/tkbltGrElemLineSpline.C @@ -29,10 +29,11 @@ */ #include -#include #include #include +#include + #include "tkbltGrElemLine.h" using namespace Blt; diff --git a/src/tkbltGrElemOption.C b/src/tkbltGrElemOption.C index bb98975..45591ac 100644 --- a/src/tkbltGrElemOption.C +++ b/src/tkbltGrElemOption.C @@ -27,11 +27,12 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include #include #include #include +#include + #include "tkbltChain.h" #include "tkbltGraph.h" diff --git a/src/tkbltGrMarker.C b/src/tkbltGrMarker.C index 1b6e1a5..6fdcfd6 100644 --- a/src/tkbltGrMarker.C +++ b/src/tkbltGrMarker.C @@ -28,9 +28,10 @@ */ #include -#include #include +#include + #include "tkbltGraph.h" #include "tkbltGrBind.h" #include "tkbltGrMarker.h" diff --git a/src/tkbltGrMarkerLine.C b/src/tkbltGrMarkerLine.C index b88c64e..30ef70e 100644 --- a/src/tkbltGrMarkerLine.C +++ b/src/tkbltGrMarkerLine.C @@ -27,10 +27,11 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include #include #include +#include + #include "tkbltGraph.h" #include "tkbltGrMarkerLine.h" #include "tkbltGrMarkerOption.h" diff --git a/src/tkbltGrMarkerText.C b/src/tkbltGrMarkerText.C index 048e717..f6307fb 100644 --- a/src/tkbltGrMarkerText.C +++ b/src/tkbltGrMarkerText.C @@ -27,9 +27,10 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include #include +#include + #include "tkbltGraph.h" #include "tkbltGrMarkerText.h" #include "tkbltGrMarkerOption.h" diff --git a/src/tkbltGrMisc.C b/src/tkbltGrMisc.C index 7ccec93..d951494 100644 --- a/src/tkbltGrMisc.C +++ b/src/tkbltGrMisc.C @@ -27,12 +27,13 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include #include #include #include #include +#include + #include #include diff --git a/src/tkbltGrPSOutput.C b/src/tkbltGrPSOutput.C index a90e921..8f02cba 100644 --- a/src/tkbltGrPSOutput.C +++ b/src/tkbltGrPSOutput.C @@ -28,11 +28,12 @@ * */ -#include #include #include #include +#include + #include "tk.h" // copied from tk3d.h diff --git a/src/tkbltGrText.C b/src/tkbltGrText.C index 81342a3..20709f1 100644 --- a/src/tkbltGrText.C +++ b/src/tkbltGrText.C @@ -27,7 +27,7 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include +#include #include #include diff --git a/src/tkbltGraphSup.C b/src/tkbltGraphSup.C index e51e483..005f10c 100644 --- a/src/tkbltGraphSup.C +++ b/src/tkbltGraphSup.C @@ -29,7 +29,8 @@ #include #include -#include + +#include #include "tkbltGraph.h" #include "tkbltGrAxis.h" diff --git a/src/tkbltVecCmd.C b/src/tkbltVecCmd.C index c113c08..d42dcda 100644 --- a/src/tkbltVecCmd.C +++ b/src/tkbltVecCmd.C @@ -46,12 +46,13 @@ * x notify reorder #1 #2 */ -#include #include #include #include #include +#include + #include "tkbltVecInt.h" #include "tkbltOp.h" #include "tkbltNsUtil.h" diff --git a/src/tkbltVecMath.C b/src/tkbltVecMath.C index 8dd5a5a..099f5f4 100644 --- a/src/tkbltVecMath.C +++ b/src/tkbltVecMath.C @@ -30,8 +30,9 @@ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#include + #include -#include #include #include #include @@ -530,7 +531,7 @@ static void MathError(Tcl_Interp* interp, double value) Tcl_SetErrorCode(interp, "ARITH", "DOMAIN", Tcl_GetStringResult(interp), (char *)NULL); } - else if ((errno == ERANGE) || isinf(value)) { + else if ((errno == ERANGE) || std::isinf(value)) { if (value == 0.0) { Tcl_AppendResult(interp, "floating-point value too small to represent", @@ -1415,7 +1416,7 @@ static int EvaluateExpression(Tcl_Interp* interp, char *string, /* Check for NaN's and overflows. */ for (vp = vPtr->valueArr, vend = vp + vPtr->length; vp < vend; vp++) { - if (!isfinite(*vp)) { + if (!std::isfinite(*vp)) { /* * IEEE floating-point error. */ @@ -1440,7 +1441,7 @@ static int ComponentFunc(ClientData clientData, Tcl_Interp* interp, MathError(interp, *vp); return TCL_ERROR; } - if (!isfinite(*vp)) { + if (!std::isfinite(*vp)) { /* * IEEE floating-point error. */ @@ -1480,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)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 +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)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,}, }; diff --git a/src/tkbltVector.C b/src/tkbltVector.C index 7bc2016..e6262ec 100644 --- a/src/tkbltVector.C +++ b/src/tkbltVector.C @@ -44,13 +44,14 @@ */ #include -#include #include #include #include #include #include +#include + #include "tkbltVecInt.h" #include "tkbltNsUtil.h" #include "tkbltSwitch.h" -- cgit v0.12