mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-23 15:40:42 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
AnyOldName3 2016-07-12 00:00:29 +01:00
parent 1a0642f1db
commit 5121e77a95
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
components/files/configurationmanager.cpp
View File

@ -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;
}

4
components/files/configurationmanager.hpp
View File

@ -84,8 +84,8 @@ struct escape_hash_filter : public boost::iostreams::input_filter
std::queue<int> mNext;
int mPrevious;
bool seenNonWhitespace = false;
bool finishLine = false;
bool mSeenNonWhitespace;
bool mFinishLine;
};
/**