[kido] 01/01: Fix tinyxml new constant
Jose Luis Rivero
jrivero-guest at moszumanska.debian.org
Mon Aug 29 01:29:11 UTC 2016
This is an automated email from the git hooks/post-receive script.
jrivero-guest pushed a commit to branch master
in repository kido.
commit be18ee3aad1498bc470ca1f6b1e230115686dde1
Author: Jose Luis Rivero <jrivero at osrfoundation.org>
Date: Mon Aug 29 01:29:04 2016 +0000
Fix tinyxml new constant
---
debian/patches/0004-fix-tinyxml-constant.patch | 54 ++++++++++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 55 insertions(+)
diff --git a/debian/patches/0004-fix-tinyxml-constant.patch b/debian/patches/0004-fix-tinyxml-constant.patch
new file mode 100644
index 0000000..151cd82
--- /dev/null
+++ b/debian/patches/0004-fix-tinyxml-constant.patch
@@ -0,0 +1,54 @@
+Description: Use new tinyxml constant
+Author: Jose Luis Rivero <jrivero at osrfoundation.org>
+Forwarded: No
+Last-Update: 2016-08-29
+
+diff --git a/kido/utils/XmlHelpers.cpp b/kido/utils/XmlHelpers.cpp
+index 6de40bd..22b8641 100644
+--- a/kido/utils/XmlHelpers.cpp
++++ b/kido/utils/XmlHelpers.cpp
+@@ -731,7 +731,7 @@ bool getAttributeBool(const tinyxml2::XMLElement* element,
+ const int result = element->QueryBoolAttribute(attributeName.c_str(),
+ &val);
+
+- if (result != tinyxml2::XML_NO_ERROR)
++ if (result != tinyxml2::XML_SUCCESS)
+ {
+ dtwarn << "[getAttribute] Error in parsing bool type attribute ["
+ << attributeName << "] of an element [" << element->Name()
+@@ -749,7 +749,7 @@ int getAttributeInt(const tinyxml2::XMLElement* element,
+ int val = 0;
+ const int result = element->QueryIntAttribute(attributeName.c_str(), &val);
+
+- if (result != tinyxml2::XML_NO_ERROR)
++ if (result != tinyxml2::XML_SUCCESS)
+ {
+ dtwarn << "[getAttribute] Error in parsing int type attribute ["
+ << attributeName << "] of an element [" << element->Name()
+@@ -768,7 +768,7 @@ unsigned int getAttributeUInt(const tinyxml2::XMLElement* element,
+ const int result = element->QueryUnsignedAttribute(attributeName.c_str(),
+ &val);
+
+- if (result != tinyxml2::XML_NO_ERROR)
++ if (result != tinyxml2::XML_SUCCESS)
+ {
+ dtwarn << "[getAttribute] Error in parsing unsiged int type attribute ["
+ << attributeName << "] of an element [" << element->Name()
+@@ -787,7 +787,7 @@ float getAttributeFloat(const tinyxml2::XMLElement* element,
+ const int result = element->QueryFloatAttribute(attributeName.c_str(),
+ &val);
+
+- if (result != tinyxml2::XML_NO_ERROR)
++ if (result != tinyxml2::XML_SUCCESS)
+ {
+ dtwarn << "[getAttribute] Error in parsing float type attribute ["
+ << attributeName << "] of an element [" << element->Name()
+@@ -806,7 +806,7 @@ double getAttributeDouble(const tinyxml2::XMLElement* element,
+ const int result = element->QueryDoubleAttribute(attributeName.c_str(),
+ &val);
+
+- if (result != tinyxml2::XML_NO_ERROR)
++ if (result != tinyxml2::XML_SUCCESS)
+ {
+ dtwarn << "[getAttribute] Error in parsing double type attribute ["
+ << attributeName << "] of an element [" << element->Name()
diff --git a/debian/patches/series b/debian/patches/series
index 44d15a0..7d3fb42 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
0001-respect-cflags.patch
0002-do-not-use-msse2.patch
0003-use-std-shared-pointers.patch
+0004-fix-tinyxml-constant.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/kido.git
More information about the debian-science-commits
mailing list