Commit 829fc4be authored by David E. DeMarle's avatar David E. DeMarle

correct no boost reading of XML data

Just fixed some typos in the CXX side or the ifdef to match the
boost side. With these (and a slight increase in temporal tolerance)
the VTK xdmf tests pass.

And finally no BOOST! Kudos to Andrew for doing the hard work.
parent 44327a2d
......@@ -196,7 +196,7 @@ XdmfGeometry::populateItem(const std::map<std::string, std::string> & itemProper
char * token = std::strtok(originString, " ");
while (token != NULL)
{
mOrigin.push_back(atoi(token));
mOrigin.push_back(atof(token));
token = std::strtok(NULL, " ");
}
......
......@@ -1123,6 +1123,7 @@ XdmfTemplate::setStep(unsigned int stepId)
{
mTrackedArrays[i]->insert(index, std::string(token));
token = std::strtok(NULL, " \t\n");
++index;
}
}
else {
......@@ -1130,6 +1131,7 @@ XdmfTemplate::setStep(unsigned int stepId)
{
mTrackedArrays[i]->insert(index, atof(token));
token = std::strtok(NULL, " \t\n");
++index;
}
}
free(trackedString);
......
......@@ -931,6 +931,7 @@ XdmfArray::populateItem(const std::map<std::string, std::string> & itemPropertie
{
this->insert(index, std::string(token));
token = std::strtok(NULL, " \t\n");
++index;
}
}
else {
......@@ -938,6 +939,7 @@ XdmfArray::populateItem(const std::map<std::string, std::string> & itemPropertie
{
this->insert(index, atof(token));
token = std::strtok(NULL, " \t\n");
++index;
}
}
#else
......
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