From e83556ae74e29ec8cc312eef14826789aacd6a60 Mon Sep 17 00:00:00 2001 From: Edgar Date: Thu, 13 Dec 2018 19:01:58 +0100 Subject: [PATCH] :bug: Fixed compiling with gcc 5 --- .gitignore | 2 +- src/moFileReader.cpp | 11 +++++------ test/test.cpp | 8 +++----- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index b0e9238..cfad50d 100644 --- a/.gitignore +++ b/.gitignore @@ -4,5 +4,5 @@ cmake-build-debug/ \.idea/ docs/node_modules/ docs/doc/ - build/ +_build/ \ No newline at end of file diff --git a/src/moFileReader.cpp b/src/moFileReader.cpp index 7516aad..9fadcb8 100644 --- a/src/moFileReader.cpp +++ b/src/moFileReader.cpp @@ -386,17 +386,16 @@ moFileReader::eErrorCode moFileReader::ExportAsHTML(std::string infile, std::str std::ofstream stream(htmlfile.c_str()); if ( stream.is_open() ) { - stream << R"()" - << std::endl; + stream << "" << std::endl; stream << "" << std::endl; - stream << R"()" << std::endl; + stream << "" << std::endl; stream << "Dump of " << fname << "" << std::endl; stream << "" << std::endl; stream << "
" <" << fname << "" << std::endl; - stream << R"()" << std::endl; + stream << "
Project Info
" << std::endl; std::stringstream parsee; parsee << reader.Lookup(""); @@ -418,7 +417,7 @@ moFileReader::eErrorCode moFileReader::ExportAsHTML(std::string infile, std::str stream << "
" << std::endl; // Now output the content - stream << R"(
Project Info
)" << std::endl; + stream << "
Content
" << std::endl; for ( moLookupList::const_iterator it = reader.m_lookup.begin(); it != reader.m_lookup.end(); it++) { @@ -430,7 +429,7 @@ moFileReader::eErrorCode moFileReader::ExportAsHTML(std::string infile, std::str stream << "
Content

" << std::endl; stream << "
" << std::endl; - stream << R"(
File generated by moFileReaderSDK
)" << std::endl; + stream << "
File generated by moFileReaderSDK
" << std::endl; stream << "" << std::endl; stream.close(); } diff --git a/test/test.cpp b/test/test.cpp index 894dac5..d42a75f 100644 --- a/test/test.cpp +++ b/test/test.cpp @@ -6,16 +6,14 @@ using namespace moFileLib; #define _L(str) moFileReaderSingleton::GetInstance().Lookup(str) #define _LC(ctx,str) moFileReaderSingleton::GetInstance().LookupWithContext(ctx,str) -auto testMo = "test.mo"; - TEST(moFileReader, setup) { - EXPECT_EQ(moFileReaderSingleton::GetInstance().ReadFile(testMo), moFileLib::moFileReader::EC_SUCCESS); + EXPECT_EQ(moFileReaderSingleton::GetInstance().ReadFile("test.mo"), moFileLib::moFileReader::EC_SUCCESS); } TEST(moFileReader, Lookup) { - moFileReaderSingleton::GetInstance ().ReadFile (testMo); + moFileReaderSingleton::GetInstance ().ReadFile ("test.mo"); /* This is the first comment. */ EXPECT_EQ ("Text Nederlands Een", _L ("String English One")); /* This is the second comment. */ @@ -27,7 +25,7 @@ TEST(moFileReader, Lookup) TEST (moFileReader, LookupWithContext) { - moFileReaderSingleton::GetInstance ().ReadFile (testMo); + moFileReaderSingleton::GetInstance ().ReadFile ("test.mo"); /* This is the first comment. */ EXPECT_EQ ("Text Nederlands Een", _LC ("TEST|String|1", "String English")); /* This is the second comment. */