Commit 1036a3c7 authored by bonnell's avatar bonnell

Fixed compile errors and updated project files for windows build. (Merged from 1.12RC)

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@6936 18c085ea-50e0-402c-830e-de6fd14e8384
parent e0327ad9
......@@ -37,7 +37,7 @@
*****************************************************************************/
// ************************************************************************* //
// avtExpressionDataTreeIterator.C //
// avtExpressionDataTreeIterator.C //
// ************************************************************************* //
#include <avtExpressionDataTreeIterator.h>
......@@ -171,6 +171,9 @@ avtExpressionDataTreeIterator::~avtExpressionDataTreeIterator()
// Hank Childs, Sun Jan 13 20:26:34 PST 2008
// Add support for constant singletons.
//
// Kathleen Bonnell, Tue Apr 7 07:55:25 PDT 2009
// Delete dat before early return.
//
// ****************************************************************************
vtkDataSet *
......@@ -245,6 +248,7 @@ avtExpressionDataTreeIterator::ExecuteData(vtkDataSet *in_ds, int index,
debug1 << "Ntuples = " << ntups << endl;
debug1 << "Ncells = " << ncells << endl;
debug1 << "Npts = " << npts << endl;
dat->Delete();
return rv;
}
......
......@@ -149,6 +149,9 @@ avtUnaryMathExpression::~avtUnaryMathExpression()
// Hank Childs, Sun Jan 13 20:07:56 PST 2008
// Add support for creating singletons.
//
// Kathleen Bonnell, Tue Apr 7 07:58:33 PDT 2009
// When data == NULL, don't create a new vtkFloatArray twice.
//
// ****************************************************************************
vtkDataArray *
......@@ -274,9 +277,7 @@ avtUnaryMathExpression::DeriveVariable(vtkDataSet *in_ds)
// the mesh.
//
ncomps = 1;
vtkFloatArray *tmp = vtkFloatArray::New();
dv = CreateArray(tmp);
tmp->Delete();
dv = vtkFloatArray::New();
}
else
{
......
......@@ -155,7 +155,7 @@ avtStreamlineWrapper::Debug()
sl->PtEnd(end);
debug1<<"******seed: "<<end;
debug1<<" Dom= [ "<<domain<<", ";
for (int i = 0; i < seedPtDomainList.size(); i++)
for (size_t i = 0; i < seedPtDomainList.size(); i++)
debug1<<seedPtDomainList[i]<<", ";
debug1<<"] ";
debug1<< " steps= "<<sl->size()<<endl;
......@@ -307,7 +307,7 @@ avtStreamlineWrapper::ComputeStatistics()
maxCnt = 0;
sum = 0;
numDomainsVisited = 0;
for (int i = 0; i < domainVisitCnts.size(); i++)
for (size_t i = 0; i < domainVisitCnts.size(); i++)
{
int cnt = domainVisitCnts[i];
if (cnt > maxCnt)
......
......@@ -46,13 +46,14 @@
#include <vector>
#include <visitstream.h>
#include <MemStream.h>
#include <filters_exports.h>
class avtStreamline;
class vtkPolyData;
class avtVector;
class avtIVPSolver;
class DomainType
class AVTFILTERS_API DomainType
{
public:
DomainType() :domain(-1), timeStep(0) {}
......@@ -73,7 +74,7 @@ class DomainType
}
bool operator<(const DomainType &dt) const
{
return domain < dt.domain && timeStep << dt.timeStep;
return domain < dt.domain && timeStep < dt.timeStep;
}
//Members
......@@ -102,7 +103,7 @@ class DomainType
//
// ****************************************************************************
class avtStreamlineWrapper
class AVTFILTERS_API avtStreamlineWrapper
{
public:
enum Status
......
......@@ -71,6 +71,10 @@
// Dave Pugmire, Mon Nov 17 12:05:04 EST 2008
// Added operators == != and methods dot, cross, length2 and length.
//
// Kathleen Bonnell, Mon Apr 20 10:38:22 MST 2009
// Added MATH_API in front of operator<< for compilation on windows when
// other classes attempt to use the method.
//
// ****************************************************************************
class MATH_API avtVector
{
......@@ -122,7 +126,7 @@ class MATH_API avtVector
double length() const;
// friends
friend ostream& operator<<(ostream& ostr,const avtVector&) STUB_OSTR;
MATH_API friend ostream& operator<<(ostream& ostr,const avtVector&) STUB_OSTR;
// input/output
const char *getAsText() STUB_STR;
......
......@@ -1780,7 +1780,7 @@ avtPixieFileFormat::GetVariableList(hid_t group, const char *name,
{
int dsize = H5Tget_size(attrType);
char *ptr = data + dsize * j + 1;
char tmp[dsize+1];
char *tmp = new char[dsize+1];
int i;
for(i = 0; i < dsize && *ptr != ' '; ++i)
tmp[i] = *ptr++;
......@@ -1792,6 +1792,7 @@ avtPixieFileFormat::GetVariableList(hid_t group, const char *name,
info2.coordY = std::string(tmp);
else
info2.coordZ = std::string(tmp);
delete [] tmp;
}
info2.hasCoords = true;
......
......@@ -40,11 +40,12 @@
#define VTK_VISIT_INTERPOLATED_VELOCITY_FIELD
#include <vtkObject.h>
#include <visit_vtk_exports.h>
class vtkDataSet;
class vtkVisItPointLocator;
class vtkVisItInterpolatedVelocityField : public vtkObject
class VISIT_VTK_API vtkVisItInterpolatedVelocityField : public vtkObject
{
public:
vtkTypeMacro(vtkVisItInterpolatedVelocityField,vtkObject);
......
......@@ -47,7 +47,7 @@
#ifndef __vtkVisItCellLocator_h
#define __vtkVisItCellLocator_h
#include <visit_vtk_exports.h>
#include <visit_vtk_light_exports.h>
#include "vtkLocator.h"
class vtkCell;
......@@ -58,7 +58,7 @@ class vtkIdList;
class vtkNeighborCells;
class vtkPoints;
class VISIT_VTK_API vtkVisItCellLocator : public vtkLocator
class VISIT_VTK_LIGHT_API vtkVisItCellLocator : public vtkLocator
{
public:
vtkTypeRevisionMacro(vtkVisItCellLocator,vtkLocator);
......
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