summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2016-08-04 14:48:56 +0200
committerAlexis Ballier <aballier@gentoo.org>2016-08-04 14:49:03 +0200
commit3b77a1b7737e4cad76736127140215a203a253c4 (patch)
tree95a966a09abb0f3598c938945874c57afd1fff67 /sci-electronics/gazebo/files
parentdev-util/cppcheck: Restrict >=dev-libs/tinyxml2-4 (bug 590428). (diff)
downloadgentoo-3b77a1b7737e4cad76736127140215a203a253c4.tar.gz
gentoo-3b77a1b7737e4cad76736127140215a203a253c4.tar.bz2
gentoo-3b77a1b7737e4cad76736127140215a203a253c4.zip
sci-electronics/gazebo: fix build with tinyxml2 4.0
Package-Manager: portage-2.3.0
Diffstat (limited to 'sci-electronics/gazebo/files')
-rw-r--r--sci-electronics/gazebo/files/tinyxml2.patch22
1 files changed, 22 insertions, 0 deletions
diff --git a/sci-electronics/gazebo/files/tinyxml2.patch b/sci-electronics/gazebo/files/tinyxml2.patch
new file mode 100644
index 00000000000..b829201f490
--- /dev/null
+++ b/sci-electronics/gazebo/files/tinyxml2.patch
@@ -0,0 +1,22 @@
+Index: gazebo-7.3.1/gazebo/util/LogPlay.cc
+===================================================================
+--- gazebo-7.3.1.orig/gazebo/util/LogPlay.cc
++++ gazebo-7.3.1/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;
+ }
+ }
+ }