Commit 1c60cf2c authored by bonnell's avatar bonnell

Fix compile errors and warnings generated on Windows

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@13675 18c085ea-50e0-402c-830e-de6fd14e8384
parent 3a4ae5d2
......@@ -341,13 +341,14 @@ type* avtIVPM3DC1Field::SetDataPointer( vtkDataSet *ds,
bool avtIVPM3DC1Field::IsInside(const double& t, const avtVector& x) const
{
double xin[3], xout[element_dimension];
double xin[3];
std::vector<double> xout(element_dimension);
xin[0] = x[0];
xin[1] = x[1];
xin[2] = x[2];
return (bool) ( get_tri_coords2D(xin, xout) >= 0 );
return (bool) ( get_tri_coords2D(xin, &xout[0]) >= 0 );
}
......
......@@ -1023,7 +1023,7 @@ avtDataRepresentation::DebugDump(avtWebpage *webpage, const char *prefix)
{
vtkDataArray *arr = newDS->GetFieldData()->GetArray(i);
string cur_name("");
if (arr->GetName() != NULL);
if (arr->GetName() != NULL)
cur_name = arr->GetName();
string dmp_name = cur_name;
orig_names.push_back(cur_name);
......
......@@ -452,11 +452,12 @@ avtM3DC1Field::operator()( const double &t, const avtVector &p ) const
double pt[3] = { p[0], p[1], p[2] };
/* Find the element containing the point; get local coords xi,eta */
double xieta[element_dimension];
double *xieta = new double[element_dimension];
int element;
if ((element = get_tri_coords2D(pt, xieta)) < 0)
{
delete [] xieta;
return avtVector(0,0,0);
}
else
......@@ -464,6 +465,7 @@ avtM3DC1Field::operator()( const double &t, const avtVector &p ) const
float B[3];
interpBcomps(B, pt, element, xieta);
delete [] xieta;
// The B value is in cylindrical coordiantes
return avtVector( B[0], B[1], B[2] );
......
......@@ -1111,7 +1111,7 @@ avtM3DC1FileFormat::GetVar(int timestate, const char *varname)
float* varPtr = (float *) var->GetVoidPointer(0);
int element;
double xieta[element_dimension];
double *xieta = new double[element_dimension];
double pt[3], centroid[3];
......@@ -1220,7 +1220,7 @@ avtM3DC1FileFormat::GetVar(int timestate, const char *varname)
vtkPts->Delete();
vtkVar->Delete();
delete [] xieta;
return var;
}
......@@ -1382,7 +1382,7 @@ avtM3DC1FileFormat::GetVectorVar(int timestate, const char *varname)
int element;
float B[3];
double pt[3], centroid[3], xieta[element_dimension];
double pt[3], centroid[3], *xieta = new double[element_dimension];
if( m_dataLocation == AVT_NODECENT)
{
......@@ -1503,6 +1503,8 @@ avtM3DC1FileFormat::GetVectorVar(int timestate, const char *varname)
vtkVarPsi->Delete();
vtkVarPsi_i->Delete();
delete [] xieta;
// Make the original data location is used.
m_dataLocation = dataLocation;
......
......@@ -29,7 +29,7 @@ class VsMDVariable;
#include <string>
#include <vector>
typedef class std::pair<std::string, int> NamePair;
typedef std::pair<std::string, int> NamePair;
class VsRegistry {
public:
......
......@@ -416,7 +416,7 @@ void
QvisScreenPositioner::keyReleaseEvent(QKeyEvent *e)
{
// Handle the key strokes.
if((e->modifiers() && Qt::ShiftModifier) > 0)
if(((e->modifiers()) & (Qt::ShiftModifier)) > 0)
paging = false;
}
......
......@@ -82,8 +82,6 @@ ${VTK_INCLUDE_DIRS}
${PYTHON_INCLUDE_PATH}
${VISIT_INCLUDE_DIR}/visitpy/visitpy
)
ADD_DEFINITIONS("-g")
LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${QT_LIBRARY_DIR} ${GLEW_LIBRARY_DIR} ${VTK_LIBRARY_DIRS} )
......
......@@ -2,9 +2,6 @@
<Plugin name="LineSampler" type="operator" label="LineSampler" version="1.0" enabled="true" mdspecificcode="false" engspecificcode="false" onlyengine="false" noengine="false" iconFile="LineSampler.xpm" category="Slicing">
<Files components="W">
</Files>
<CXXFLAGS>
-g
</CXXFLAGS>
<Attribute name="LineSamplerAttributes" purpose="This class contains attributes for the line sampler operator." persistent="true" keyframe="true" exportAPI="" exportInclude="">
<Enum name="CoordinateSystem">
Cartesian
......
......@@ -1892,7 +1892,7 @@ islandChecks( vector< Point >& points,
double min_len_index;
double min_dist = 1.0e9; // Minimum distance.
double min_dist_index;
double min_dist_index=0;
double min_dist2 = 1.0e9;// Second minimum distance.
double min_dist2_index;
......@@ -2601,7 +2601,7 @@ FieldlineLib::fieldlineProperties( vector< Point > &ptList,
for( unsigned int i=0; i<periodWindingPairs.size(); ++i )
{
if( verboseFlag & i<10 )
if( verboseFlag && i<10 )
cerr << "Period based winding pair: "
<< periodWindingPairs[i].toroidal << ","
<< periodWindingPairs[i].poloidal << " "
......
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