From 7e4694614837c2bf9e12ee09c754114a3f6c539d Mon Sep 17 00:00:00 2001 From: Cowering Date: Thu, 25 Jun 2015 21:50:22 -0500 Subject: [PATCH] -pedantic fixes.. do these need to go upstream? (nw) --- 3rdparty/unittest-cpp/UnitTest++/DeferredTestReporter.h | 2 +- 3rdparty/unittest-cpp/UnitTest++/DeferredTestResult.h | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/3rdparty/unittest-cpp/UnitTest++/DeferredTestReporter.h b/3rdparty/unittest-cpp/UnitTest++/DeferredTestReporter.h index 757e53f808e..35425d8754b 100644 --- a/3rdparty/unittest-cpp/UnitTest++/DeferredTestReporter.h +++ b/3rdparty/unittest-cpp/UnitTest++/DeferredTestReporter.h @@ -10,7 +10,7 @@ #include -UNITTEST_STDVECTOR_LINKAGE(UnitTest::DeferredTestResult); +UNITTEST_STDVECTOR_LINKAGE(UnitTest::DeferredTestResult) namespace UnitTest { diff --git a/3rdparty/unittest-cpp/UnitTest++/DeferredTestResult.h b/3rdparty/unittest-cpp/UnitTest++/DeferredTestResult.h index 092956657c5..0f24b4abb9a 100644 --- a/3rdparty/unittest-cpp/UnitTest++/DeferredTestResult.h +++ b/3rdparty/unittest-cpp/UnitTest++/DeferredTestResult.h @@ -23,7 +23,7 @@ public: } -UNITTEST_STDVECTOR_LINKAGE(UnitTest::DeferredTestFailure); +UNITTEST_STDVECTOR_LINKAGE(UnitTest::DeferredTestFailure) namespace UnitTest { @@ -34,14 +34,14 @@ public: DeferredTestResult(); DeferredTestResult(char const* suite, char const* test); ~DeferredTestResult(); - + std::string suiteName; std::string testName; std::string failureFile; - + typedef std::vector< DeferredTestFailure > FailureVec; FailureVec failures; - + float timeElapsed; bool failed; };