Update datatest.cpp

1 files changed, 8 insertions, 9 deletions

diff --git a/datatest.cpp b/datatest.cpp
index 6417d38c..4a7a5554 100644
--- a/datatest.cpp
+++ b/datatest.cpp
@@ -43,17 +43,10 @@ NAMESPACE_BEGIN(Test)
 

 ANONYMOUS_NAMESPACE_BEGIN

 

-typedef std::map<std::string, std::string> TestData;

 bool s_thorough = false;

-const std::string testDataFilename = "cryptest.dat";

-

-class TestFailure : public Exception

-{

-public:

-	TestFailure() : Exception(OTHER_ERROR, "Validation test failed") {}

-};

-

+typedef std::map<std::string, std::string> TestData;

 const TestData *s_currentTestData = NULLPTR;

+const std::string testDataFilename = "cryptest.dat";

 

 // Handles CR, LF, and CRLF properly

 bool Readline(std::istream& stream, std::string& line)

@@ -119,6 +112,12 @@ std::string TrimComment(const std::string& str)
 		return TrimSpace(str);

 }

 

+class TestFailure : public Exception

+{

+public:

+	TestFailure() : Exception(OTHER_ERROR, "Validation test failed") {}

+};

+

 void OutputTestData(const TestData &v)

 {

 	std::cerr << "\n";