Commit aec93d49 authored by cyrush's avatar cyrush
Browse files

resolved AIX build issues

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@3319 18c085ea-50e0-402c-830e-de6fd14e8384
parent 27d27cf8
......@@ -62,6 +62,7 @@
#include <DebugStream.h>
#include <ExpressionException.h>
using namespace std;
// ****************************************************************************
// Method: avtExpressionFilter constructor
......@@ -280,6 +281,9 @@ avtExpressionFilter::PostExecute(void)
// Jeremy Meredith, Thu Feb 7 18:02:12 EST 2008
// Added support for updating the component extents of array variables.
//
// Cyrus Harrison, Mon Feb 25 13:22:19 PST 2008
// Changed std::isfinite to isfinite to work around an AIX compiler bug.
//
// ****************************************************************************
void
......@@ -355,7 +359,7 @@ avtExpressionFilter::UpdateExtents(avtDataTree_p tree)
value = MajorEigenvalue(val);
// else ... we handle array variables below
if(!std::isfinite(value))
if(!isfinite(value))
{
// Ignore nan, -inf, and inf
continue;
......
......@@ -82,6 +82,7 @@
using std::vector;
using std::string;
using namespace std;
void GetDataScalarRange(vtkDataSet *, double *, const char *, bool);
......@@ -1222,6 +1223,9 @@ GetDataRange(vtkDataSet *ds, double *de, const char *vname,
// Gunther H. Weber, Fri Feb 1 11:55:59 PST 2008
// Skip nan, -inf and +inf in min/max calculation
//
// Cyrus Harrison, Mon Feb 25 11:03:03 PST 2008
// Changed std::isfinite to isfinite to work around an AIX compiler bug.
//
// ****************************************************************************
template <class T> static bool
......@@ -1235,7 +1239,7 @@ GetScalarRange(T *buf, int n, double *exts, unsigned char *ghosts)
if ((ghosts != NULL) && (ghosts[i] != '\0'))
continue;
if (!std::isfinite(*buf))
if (!isfinite(*buf))
continue;
if (!setOne)
......@@ -1517,6 +1521,9 @@ GetDataAllComponentsRange(vtkDataSet *ds, double *exts, const char *vname,
// Gunther H. Weber, Fri Feb 1 11:55:59 PST 2008
// Skip nan, -inf and +inf in min/max calculation
//
// Cyrus Harrison, Mon Feb 25 11:03:03 PST 2008
// Changed std::isfinite to isfinite to work around an AIX compiler bug.
//
// ****************************************************************************
template <class T> static void
......@@ -1532,7 +1539,7 @@ GetMagnitudeRange(T *buf, int n, int ncomps, double *exts,
for (int j = 0; j < ncomps; j++, buf++)
mag += *buf * *buf;
if (!std::isfinite(mag))
if (!isfinite(mag))
continue;
if (mag < exts[0])
......@@ -1653,6 +1660,9 @@ GetDataMagnitudeRange(vtkDataSet *ds, double *exts, const char *vname,
// Gunther H. Weber, Fri Feb 1 11:55:59 PST 2008
// Skip nan, -inf and +inf in min/max calculation
//
// Cyrus Harrison, Mon Feb 25 11:03:03 PST 2008
// Changed std::isfinite to isfinite to work around an AIX compiler bug.
//
// ****************************************************************************
void
......@@ -1705,7 +1715,7 @@ GetDataMajorEigenvalueRange(vtkDataSet *ds, double *exts, const char *vname,
double val = MajorEigenvalue(ptr);
if (!std::isfinite(val))
if (!isfinite(val))
continue;
exts[0] = (exts[0] < val ? exts[0] : val);
......
......@@ -324,6 +324,9 @@ QvisParallelCoordinatesPlotWindow::CreateWindowContents()
// Jeremy Meredith, Mon Feb 18 16:17:21 EST 2008
// Don't enable de/up/down buttons if we were created from an array var.
//
// Cyrus Harrison, Mon Feb 25 13:42:21 PST 2008
// Resolved AIX QString init error.
//
// ****************************************************************************
void
......@@ -333,7 +336,7 @@ QvisParallelCoordinatesPlotWindow::UpdateWindow(bool doAll)
double r;
QString oldAxis = axisList->currentItem() ?
axisList->currentItem()->text(0) : "";
axisList->currentItem()->text(0) : QString("");
for(int i = 0; i < atts->NumAttributes(); ++i)
{
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment