From 5121e77a95667aafc82665ad8d8cb390153058bf Mon Sep 17 00:00:00 2001 From: AnyOldName3 Date: Tue, 12 Jul 2016 00:00:29 +0100 Subject: [PATCH] Remove the cause of a warning which upset Travis (but not the thing that made the Travis build fail, as I have no idea why it wouldn't work or how to fix it --- components/files/configurationmanager.cpp | 20 ++++++++++---------- components/files/configurationmanager.hpp | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/components/files/configurationmanager.cpp b/components/files/configurationmanager.cpp index d8543738d..951c444a5 100644 --- a/components/files/configurationmanager.cpp +++ b/components/files/configurationmanager.cpp @@ -164,7 +164,7 @@ bool ConfigurationManager::loadConfig(const boost::filesystem::path& path, return false; } -escape_hash_filter::escape_hash_filter() : mNext() +escape_hash_filter::escape_hash_filter() : mNext(), mSeenNonWhitespace(false), mFinishLine(false) { } @@ -186,23 +186,23 @@ int escape_hash_filter::get(Source & src) } else if (character == EOF) { - seenNonWhitespace = false; - finishLine = false; + mSeenNonWhitespace = false; + mFinishLine = false; mNext.push(character); } else if (character == '\n') { - seenNonWhitespace = false; - finishLine = false; + mSeenNonWhitespace = false; + mFinishLine = false; mNext.push(character); } - else if (finishLine) + else if (mFinishLine) { mNext.push(character); } else if (character == '#') { - if (seenNonWhitespace) + if (mSeenNonWhitespace) { mNext.push(sEscape); mNext.push(sHashIdentifier); @@ -211,7 +211,7 @@ int escape_hash_filter::get(Source & src) { //it's fine being interpreted by Boost as a comment, and so is anything afterwards mNext.push(character); - finishLine = true; + mFinishLine = true; } } else if (mPrevious == sEscape) @@ -223,8 +223,8 @@ int escape_hash_filter::get(Source & src) { mNext.push(character); } - if (!seenNonWhitespace && !isspace(character)) - seenNonWhitespace = true; + if (!mSeenNonWhitespace && !isspace(character)) + mSeenNonWhitespace = true; if (record) mPrevious = character; } diff --git a/components/files/configurationmanager.hpp b/components/files/configurationmanager.hpp index e6257eec4..20d5c62ec 100644 --- a/components/files/configurationmanager.hpp +++ b/components/files/configurationmanager.hpp @@ -84,8 +84,8 @@ struct escape_hash_filter : public boost::iostreams::input_filter std::queue mNext; int mPrevious; - bool seenNonWhitespace = false; - bool finishLine = false; + bool mSeenNonWhitespace; + bool mFinishLine; }; /**