Commit ab35a107 authored by hrchilds's avatar hrchilds
Browse files

Update from July 7, 2005

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@496 18c085ea-50e0-402c-830e-de6fd14e8384
parent b7db3165
......@@ -1362,6 +1362,10 @@ avtPickQuery::GetCurrentZoneForOriginal(vtkDataSet *ds, const int origZone)
// Kathleen Bonnell, Thu Jun 30 15:39:03 PDT 2005
// Correct the logic for finding current zones.
//
// Jeremy Meredith, Thu Jul 7 09:20:39 PDT 2005
// Made the zoneFound array dynamically allocated to make more
// compilers happy.
//
// ****************************************************************************
intVector
......@@ -1379,7 +1383,7 @@ avtPickQuery::GetCurrentZoneForOriginal(vtkDataSet *ds,
int i, j;
unsigned int *oc = origCells->GetPointer(0);
int nFound = 0;
bool zoneFound[origZones.size()];
bool *zoneFound = new bool[origZones.size()];
for (i = 0; i < origZones.size(); i++)
zoneFound[i] = false;
for (i = 0; i < nTuples && nFound < origZones.size(); i++)
......@@ -1395,6 +1399,7 @@ avtPickQuery::GetCurrentZoneForOriginal(vtkDataSet *ds,
}
}
}
delete[] zoneFound;
}
return currentZones;
}
......
......@@ -10080,6 +10080,9 @@ visit_ClientMethod(PyObject *self, PyObject *args)
// Creation: Wed May 4 16:58:15 PST 2005
//
// Modifications:
// Jeremy Meredith, Thu Jul 7 10:05:26 PDT 2005
// On 64-bit AIX, one cannot convert a void* to an int. I instead compare
// the second void* pointer with NULL to construct the boolean result.
//
// ****************************************************************************
......@@ -10093,7 +10096,7 @@ visit_exec_client_method(void *data)
{
void **cbData = (void **)data;
ClientMethod *m = (ClientMethod *)cbData[0];
bool acquireLock = ((int)cbData[1]) == 1;
bool acquireLock = cbData[1] ? true : false;
PyThreadState *myThreadState = 0;
......
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