Commit a2dafcb1 authored by mdurant's avatar mdurant
Browse files

Removing the 'using boost' directive and using the boost:: namespace directive...

Removing the 'using boost' directive and using the boost:: namespace directive as necessary.  Apparently was causing a problem with VS 10

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@12580 18c085ea-50e0-402c-830e-de6fd14e8384
parent d385f625
......@@ -93,7 +93,7 @@
#include <hdf5.h>
#include <visit-hdf5.h>
#include <boost/cstdint.hpp>
using boost::int32_t;
// using boost::boost::int32_t; // This conflicts with Visual Studio 10
using std::string;
......@@ -1993,7 +1993,7 @@ avtChomboFileFormat::GetLevelAndLocalPatchNumber(int global_patch,
class LookUpOrderCmp
{
public:
LookUpOrderCmp(const int32_t *d1, const int32_t *d2) : order1Var(d1), order2Var(d2) {}
LookUpOrderCmp(const boost::int32_t *d1, const boost::int32_t *d2) : order1Var(d1), order2Var(d2) {}
bool operator()(vtkIdType a, vtkIdType b)
{
return order1Var[a] < order1Var[b] ||
......@@ -2001,8 +2001,8 @@ class LookUpOrderCmp
}
private:
const int32_t *order1Var;
const int32_t *order2Var;
const boost::int32_t *order1Var;
const boost::int32_t *order2Var;
};
vtkDataSet *
......@@ -2370,8 +2370,8 @@ avtChomboFileFormat::GetMesh(int patch, const char *meshname)
}
}
int32_t *particleOrder = 0;
int32_t *polymerNo = 0;
boost::int32_t *particleOrder = 0;
boost::int32_t *polymerNo = 0;
if (connectParticles &&
std::find(
......@@ -2394,7 +2394,7 @@ avtChomboFileFormat::GetMesh(int patch, const char *meshname)
H5Sget_simple_extent_dims(dataSpace, &nParticlesCheck, NULL);
if (nParticles == nParticlesCheck)
{
particleOrder = new int32_t[nParticles];
particleOrder = new boost::int32_t[nParticles];
H5Dread(dataSet, H5T_NATIVE_INT32, H5S_ALL, H5S_ALL, H5P_DEFAULT, particleOrder);
}
}
......@@ -2414,7 +2414,7 @@ avtChomboFileFormat::GetMesh(int patch, const char *meshname)
H5Sget_simple_extent_dims(dataSpace, &nParticlesCheck, NULL);
if (nParticles == nParticlesCheck)
{
polymerNo = new int32_t[nParticles];
polymerNo = new boost::int32_t[nParticles];
H5Dread(dataSet, H5T_NATIVE_INT32, H5S_ALL, H5S_ALL, H5P_DEFAULT, polymerNo);
}
}
......
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