diff options
author | Mikkel Krautz <mikkel@krautz.dk> | 2018-02-11 02:03:58 +0300 |
---|---|---|
committer | Mikkel Krautz <mikkel@krautz.dk> | 2018-02-11 02:03:58 +0300 |
commit | 7f5225741781974cc6d1a01ec82c3c859f72b225 (patch) | |
tree | ebeecb199f88032d548efc1acef93cd2b0b84652 /src | |
parent | 39c526a74fb66f3488aaf74afde10396c914520e (diff) |
XMLTools: remove default argument 'opstyle' in recurseParse().
This fixes the build on our OS X Universal builder.
Our legacy OS X Universal builder's gcc 4.2 seems to
misparse this.
The only place the default argument is used is in test
code, which is easily changable. Also, this is internal
API, so we can change it as we wish.
Fixes mumble-voip/mumble#3336
Diffstat (limited to 'src')
-rw-r--r-- | src/mumble/XMLTools.h | 2 | ||||
-rw-r--r-- | src/tests/TestXMLTools/TestXMLTools.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/mumble/XMLTools.h b/src/mumble/XMLTools.h index 9b19f674e..62e041b95 100644 --- a/src/mumble/XMLTools.h +++ b/src/mumble/XMLTools.h @@ -22,7 +22,7 @@ class XMLTools : public QObject { static void recurseParse(QXmlStreamReader &reader,
QXmlStreamWriter &writer,
int ¶graphs,
- const QMap<QString, QString> &opstyle = QMap<QString, QString>(),
+ const QMap<QString, QString> &opstyle,
const int close = 0, bool ignore = true);
/* Iterate XML and remove close-followed-by-open.
diff --git a/src/tests/TestXMLTools/TestXMLTools.cpp b/src/tests/TestXMLTools/TestXMLTools.cpp index e85520828..f42fd74ad 100644 --- a/src/tests/TestXMLTools/TestXMLTools.cpp +++ b/src/tests/TestXMLTools/TestXMLTools.cpp @@ -54,7 +54,8 @@ QString TestXMLTools::doParse(QString input) { QXmlStreamWriter writerOut(&outBuf); outBuf.open(QIODevice::WriteOnly); int paragraphs = 0; - XMLTools::recurseParse(reader, writerOut, paragraphs); + QMap<QString, QString> pstyle; + XMLTools::recurseParse(reader, writerOut, paragraphs, pstyle); outBuf.close(); return QString(outBuf.data()); } |