Commit 95f7bcd0 authored by Chris Cantwell's avatar Chris Cantwell

Fix gcc warnings in Tester.

parent a4923a76
...@@ -36,8 +36,10 @@ ...@@ -36,8 +36,10 @@
#include <fstream> #include <fstream>
#include <vector> #include <vector>
#include <MetricFile.h> #include <boost/core/ignore_unused.hpp>
#include <boost/algorithm/string.hpp> #include <boost/algorithm/string.hpp>
#include <MetricFile.h>
#include <sha1.h> #include <sha1.h>
namespace Nektar namespace Nektar
...@@ -164,6 +166,8 @@ namespace Nektar ...@@ -164,6 +166,8 @@ namespace Nektar
bool MetricFile::v_Test(std::istream& pStdout, std::istream& pStderr) bool MetricFile::v_Test(std::istream& pStdout, std::istream& pStderr)
{ {
boost::ignore_unused(pStdout, pStderr);
std::map<std::string, std::string>::iterator it; std::map<std::string, std::string>::iterator it;
bool success = true; bool success = true;
...@@ -185,6 +189,8 @@ namespace Nektar ...@@ -185,6 +189,8 @@ namespace Nektar
void MetricFile::v_Generate(std::istream& pStdout, std::istream& pStderr) void MetricFile::v_Generate(std::istream& pStdout, std::istream& pStderr)
{ {
boost::ignore_unused(pStdout, pStderr);
std::map<std::string, std::string>::iterator it; std::map<std::string, std::string>::iterator it;
// Update SHA1 hashes. // Update SHA1 hashes.
......
...@@ -33,6 +33,8 @@ ...@@ -33,6 +33,8 @@
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
#include <MetricRegex.h> #include <MetricRegex.h>
#include <boost/core/ignore_unused.hpp>
#include <boost/lexical_cast.hpp> #include <boost/lexical_cast.hpp>
#include <boost/algorithm/string.hpp> #include <boost/algorithm/string.hpp>
...@@ -116,6 +118,8 @@ namespace Nektar ...@@ -116,6 +118,8 @@ namespace Nektar
*/ */
bool MetricRegex::v_Test(std::istream& pStdout, std::istream& pStderr) bool MetricRegex::v_Test(std::istream& pStdout, std::istream& pStderr)
{ {
boost::ignore_unused(pStdout, pStderr);
ASSERTL0(m_matches.size(), "No test conditions defined for Regex."); ASSERTL0(m_matches.size(), "No test conditions defined for Regex.");
std::vector<MetricRegexFieldValue> &okValues = m_matches[0]; std::vector<MetricRegexFieldValue> &okValues = m_matches[0];
...@@ -265,6 +269,8 @@ namespace Nektar ...@@ -265,6 +269,8 @@ namespace Nektar
*/ */
void MetricRegex::v_Generate(std::istream& pStdout, std::istream& pStderr) void MetricRegex::v_Generate(std::istream& pStdout, std::istream& pStderr)
{ {
boost::ignore_unused(pStderr);
boost::cmatch matches; boost::cmatch matches;
// Process output file line by line searching for regex matches // Process output file line by line searching for regex matches
......
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
// //
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
#include <boost/core/ignore_unused.hpp>
#include <boost/lexical_cast.hpp> #include <boost/lexical_cast.hpp>
#include <boost/algorithm/string.hpp> #include <boost/algorithm/string.hpp>
...@@ -59,7 +60,7 @@ namespace Nektar ...@@ -59,7 +60,7 @@ namespace Nektar
TestData::TestData(const TestData& pSrc) TestData::TestData(const TestData& pSrc)
{ {
boost::ignore_unused(pSrc);
} }
const std::string& TestData::GetDescription() const const std::string& TestData::GetDescription() const
...@@ -135,7 +136,7 @@ namespace Nektar ...@@ -135,7 +136,7 @@ namespace Nektar
void TestData::Parse(TiXmlDocument* pDoc) void TestData::Parse(TiXmlDocument* pDoc)
{ {
TiXmlHandle handle(m_doc); TiXmlHandle handle(pDoc);
TiXmlElement *testElement, *tmp, *metrics, *files; TiXmlElement *testElement, *tmp, *metrics, *files;
testElement = handle.FirstChildElement("test").Element(); testElement = handle.FirstChildElement("test").Element();
ASSERTL0(testElement, "Cannot find 'test' root element."); ASSERTL0(testElement, "Cannot find 'test' root element.");
......
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