Commit e4e9a10b authored by David Moxey's avatar David Moxey

Fix Douglas' comments, try to fix Windows buildbot

parent 67fa92be
......@@ -144,15 +144,15 @@ bool ParseUtils::GenerateVector(const std::string &str, std::vector<T> &out)
return success && it == str.end();
}
template bool ParseUtils::GenerateVector<int>(
template LIB_UTILITIES_EXPORT bool ParseUtils::GenerateVector<int>(
const std::string &str, std::vector<int> &out);
template bool ParseUtils::GenerateVector<long>(
template LIB_UTILITIES_EXPORT bool ParseUtils::GenerateVector<long>(
const std::string &str, std::vector<long> &out);
template bool ParseUtils::GenerateVector<unsigned int>(
template LIB_UTILITIES_EXPORT bool ParseUtils::GenerateVector<unsigned int>(
const std::string &str, std::vector<unsigned int> &out);
template bool ParseUtils::GenerateVector<double>(
template LIB_UTILITIES_EXPORT bool ParseUtils::GenerateVector<double>(
const std::string &str, std::vector<double> &out);
template bool ParseUtils::GenerateVector<float>(
template LIB_UTILITIES_EXPORT bool ParseUtils::GenerateVector<float>(
const std::string &str, std::vector<float> &out);
/**
......@@ -161,7 +161,7 @@ template bool ParseUtils::GenerateVector<float>(
* This routine specialises for the std::string data type as this type is not
* supported by boost::spirit::qi::auto_.
*/
template <>
template <> LIB_UTILITIES_EXPORT
bool ParseUtils::GenerateVector(const std::string &str,
std::vector<std::string> &out)
{
......
......@@ -50,7 +50,7 @@ public:
LIB_UTILITIES_EXPORT static bool GenerateSeqVector(
const std::string &str, std::vector<unsigned int> &out);
LIB_UTILITIES_EXPORT template <typename T>
template <typename T>
static bool GenerateVector(const std::string &str, std::vector<T> &out);
/**
......
......@@ -661,7 +661,7 @@ TopoDS_Shape CADSystemOCE::BuildGeo(string geo)
ASSERTL0(surfs.size() == 1, "more than 1 surf");
it = surfs.begin();
vector<unsigned int> data;
ParseUtils::GenerateVector(it->second), data);
ParseUtils::GenerateVector(it->second, data);
BRepBuilderAPI_MakeFace face(cWires[data[0]], true);
for (int i = 1; i < data.size(); i++)
{
......
......@@ -639,7 +639,6 @@ namespace Nektar
{
std::string fieldStr = fStr;
bool valid = ParseUtils::GenerateVector(fieldStr,fieldStrings);
std::cout << "GOT: " << fieldStrings.size() << endl;
ASSERTL0(valid,"Unable to correctly parse the field string in ExpansionTypes.");
}
......@@ -756,7 +755,6 @@ namespace Nektar
// interpret the basis type string.
std::vector<std::string> basisStrings;
std::vector<LibUtilities::BasisType> basis;
std::cout << "PARSING2 " << basisTypeStr << std::endl;
bool valid = ParseUtils::GenerateVector(basisTypeStr, basisStrings);
ASSERTL0(valid, "Unable to correctly parse the basis types.");
for (vector<std::string>::size_type i = 0; i < basisStrings.size(); i++)
......@@ -778,7 +776,6 @@ namespace Nektar
std::string numModesStr = nModesStr;
std::vector<unsigned int> numModes;
std::cout << "PARSING3 " << numModesStr << std::endl;
valid = ParseUtils::GenerateVector(numModesStr, numModes);
ASSERTL0(valid, "Unable to correctly parse the number of modes.");
ASSERTL0(numModes.size() == basis.size(),"information for num modes does not match the number of basis");
......@@ -789,7 +786,6 @@ namespace Nektar
// interpret the points type string.
std::vector<std::string> pointsStrings;
std::vector<LibUtilities::PointsType> points;
std::cout << "PARSING4 " << pointsTypeStr << std::endl;
valid = ParseUtils::GenerateVector(pointsTypeStr, pointsStrings);
ASSERTL0(valid, "Unable to correctly parse the points types.");
for (vector<std::string>::size_type i = 0; i < pointsStrings.size(); i++)
......@@ -811,7 +807,6 @@ namespace Nektar
ASSERTL0(nPointsStr,"NUMPOINTS was not defined in EXPANSION section of input");
std::string numPointsStr = nPointsStr;
std::vector<unsigned int> numPoints;
std::cout << "PARSING5 " << numPointsStr << std::endl;
valid = ParseUtils::GenerateVector(numPointsStr, numPoints);
ASSERTL0(valid, "Unable to correctly parse the number of points.");
ASSERTL0(numPoints.size() == numPoints.size(),"information for num points does not match the number of basis");
......@@ -863,7 +858,6 @@ namespace Nektar
if(fStr) // extract other fields.
{
std::string fieldStr = fStr;
std::cout << "PARSING6 " << fieldStr << std::endl;
bool valid = ParseUtils::GenerateVector(fieldStr,fieldStrings);
ASSERTL0(valid,"Unable to correctly parse the field string in ExpansionTypes.");
}
......
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