possible fix for mavericks

This commit is contained in:
Nick Bolton
2014-01-24 17:53:03 +00:00
parent 50e97e23f0
commit 3d963bfbe7
7 changed files with 68 additions and 14 deletions

View File

@@ -615,7 +615,7 @@ void
CConfig::read(CConfigReadContext& context)
{
CConfig tmp(m_events);
while (context) {
while (context.getStream()) {
tmp.readSection(context);
}
*this = tmp;
@@ -1924,11 +1924,6 @@ CConfigReadContext::getLineNumber() const
return m_line;
}
CConfigReadContext::operator void*() const
{
return m_stream;
}
bool
CConfigReadContext::operator!() const
{

View File

@@ -491,7 +491,6 @@ public:
bool readLine(CString&);
UInt32 getLineNumber() const;
operator void*() const;
bool operator!() const;
OptionValue parseBoolean(const CString&) const;
@@ -513,6 +512,7 @@ public:
IPlatformScreen::CButtonInfo*
parseMouse(const CString& mouse) const;
KeyModifierMask parseModifier(const CString& modifiers) const;
std::istream& getStream() const { return m_stream; };
private:
// not implemented