sofa-framework (1.0~beta4-7) tinyxml26.diff

Summary

 applications/sofa/gui/qt/GraphVisitor.cpp |   12 ++++++------
 modules/sofa/simulation/tree/xml/XML.cpp  |    2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

    
download this patch

Patch contents

--- a/applications/sofa/gui/qt/GraphVisitor.cpp
+++ b/applications/sofa/gui/qt/GraphVisitor.cpp
@@ -207,10 +207,10 @@
 	Q3ListViewItem *graphNode=NULL;
 	switch (typeOfNode)
 	  {
-	  case TiXmlNode::DOCUMENT:
+	  case TiXmlNode::TINYXML_DOCUMENT:
 	    break;
 
-	  case TiXmlNode::ELEMENT:
+	  case TiXmlNode::TINYXML_ELEMENT:
             if (nameOfNode == "Time")
               {
                 openTime( node, parent);
@@ -222,17 +222,17 @@
               }
 	    break;
 
-	  case TiXmlNode::COMMENT:
+	  case TiXmlNode::TINYXML_COMMENT:
 	    graphNode = addComment(parent, elementAbove, nameOfNode); 
 	    break;
 
-	  case TiXmlNode::UNKNOWN:
+	  case TiXmlNode::TINYXML_UNKNOWN:
 	    break;
 
-	  case TiXmlNode::TEXT:
+	  case TiXmlNode::TINYXML_TEXT:
 	    break;
 
-	  case TiXmlNode::DECLARATION:
+	  case TiXmlNode::TINYXML_DECLARATION:
 	    break;
 	  default:
 	    break;
--- a/modules/sofa/simulation/tree/xml/XML.cpp
+++ b/modules/sofa/simulation/tree/xml/XML.cpp
@@ -84,7 +84,7 @@
 BaseElement* createNode(TiXmlNode* root, const char *basefilename, bool isRoot = false)
 {
 	//if (!xmlStrcmp(root->name,(const xmlChar*)"text")) return NULL;
-    if (root->Type() != TiXmlNode::ELEMENT) return NULL;
+    if (root->Type() != TiXmlNode::TINYXML_ELEMENT) return NULL;
 	TiXmlElement* element = root->ToElement();
 	if (!element || !element->Value() || !element->Value()[0]) return NULL;