From c3bf414ad5d80a1ffcae0f19357753f0ef26a00f Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 4 Nov 2017 19:25:32 +0300 Subject: Add workaround for fix compilation with tinyxml2 from master branch. In tinyxml2 was unversioned api breakage in master branch. --- src/utils/xml/tinyxml2.cpp | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src/utils') diff --git a/src/utils/xml/tinyxml2.cpp b/src/utils/xml/tinyxml2.cpp index a7275b7f1..913e0e953 100644 --- a/src/utils/xml/tinyxml2.cpp +++ b/src/utils/xml/tinyxml2.cpp @@ -44,10 +44,17 @@ namespace XML { static void showErrorStatus(tinyxml2::XMLDocument &doc) { +#ifdef USE_TINYXML_OLD logger->log("xml error: %s, in lines: %s\n%s", doc.ErrorName(), doc.GetErrorStr1(), doc.GetErrorStr2()); +#else // USE_TINYXML_OLD + + logger->log("xml error: %s, in lines: %s", + doc.ErrorName(), + doc.ErrorStr()); +#endif // USE_TINYXML_OLD } Document::Document(const std::string &filename, -- cgit v1.2.3-60-g2f50