Bug#835427: s/XML_NO_ERROR/XML_SUCCESS/

[Peter Michael Green]

tags 835427 +patch
thanks
> Older versions of tinyxml defined both XML_NO_ERROR and XML_SUCCESS to 0. Never
> versions define only XML_SUCCESS.

Attatched is a patch that replaces XML_NO_ERROR with XML_SUCCESS


-------------- next part --------------
diff -Nru gazebo-7.3.0+dfsg/debian/changelog gazebo-7.3.0+dfsg/debian/changelog
--- gazebo-7.3.0+dfsg/debian/changelog	2016-07-21 15:33:10.000000000 +0000
+++ gazebo-7.3.0+dfsg/debian/changelog	2016-08-27 16:02:33.000000000 +0000
@@ -1,3 +1,9 @@
+gazebo (7.3.0+dfsg-2+rpi1) stretch-staging; urgency=medium
+
+  * Change XML_NO_ERROR to XML_SUCCESS (Closes: 835427)
+
+ -- Peter Michael Green <plugwash at raspbian.org>  Sat, 27 Aug 2016 16:02:33 +0000
+
 gazebo (7.3.0+dfsg-2) unstable; urgency=medium
 
    * Patch to fix linking with gcc6 (Closes: #831176)
diff -Nru gazebo-7.3.0+dfsg/debian/patches/0010-xml-no-error.patch gazebo-7.3.0+dfsg/debian/patches/0010-xml-no-error.patch
--- gazebo-7.3.0+dfsg/debian/patches/0010-xml-no-error.patch	1970-01-01 00:00:00.000000000 +0000
+++ gazebo-7.3.0+dfsg/debian/patches/0010-xml-no-error.patch	2016-08-27 16:02:33.000000000 +0000
@@ -0,0 +1,24 @@
+Description:  Change XML_NO_ERROR to XML_SUCCESS (Closes: 835427)
+Author: Peter Michael Green <plugwash at raspbian.org>
+Bug-Debian: https://bugs.debian.org/835427
+
+--- gazebo-7.3.0+dfsg.orig/gazebo/util/LogPlay.cc
++++ gazebo-7.3.0+dfsg/gazebo/util/LogPlay.cc
+@@ -72,7 +72,7 @@ void LogPlay::Open(const std::string &_l
+ 
+   // Flag use to indicate if a parser failure has occurred
+   bool xmlParserFail = this->dataPtr->xmlDoc.LoadFile(_logFile.c_str()) !=
+-    tinyxml2::XML_NO_ERROR;
++    tinyxml2::XML_SUCCESS;
+ 
+   // Parse the log file
+   if (xmlParserFail)
+@@ -105,7 +105,7 @@ void LogPlay::Open(const std::string &_l
+ 
+           // Retry loading the log file.
+           xmlParserFail = this->dataPtr->xmlDoc.LoadFile(_logFile.c_str()) !=
+-            tinyxml2::XML_NO_ERROR;
++            tinyxml2::XML_SUCCESS;
+         }
+       }
+     }
diff -Nru gazebo-7.3.0+dfsg/debian/patches/series gazebo-7.3.0+dfsg/debian/patches/series
--- gazebo-7.3.0+dfsg/debian/patches/series	2016-07-21 15:35:01.000000000 +0000
+++ gazebo-7.3.0+dfsg/debian/patches/series	2016-08-27 16:02:33.000000000 +0000
@@ -2,3 +2,4 @@
 0005-fix-problems-on-manpage.patch
 0008-arial-font-removed-in-dfsg.patch
 0009-fix-gcc6-linking.patch
+0010-xml-no-error.patch