Bug#628114: sofa-framework: Transition to tinyxml 2.6.2

[Felix Geyer]

Package: src:sofa-framework
Version: 1.0~beta4-5
Severity: serious
Tags: patch

I have started the tinyxml 2.6.2 transition.
It is still in binary NEW but once the package is accepted sofa-framework
needs to be rebuilt.

I'm attaching a patch that makes sofa-framework compatible with tinyxml 2.6.2.

--- sofa-framework-1.0~beta4.orig/modules/sofa/simulation/tree/xml/XML.cpp
+++ sofa-framework-1.0~beta4/modules/sofa/simulation/tree/xml/XML.cpp
@@ -84,7 +84,7 @@ int numDefault=0;
 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;
 
--- sofa-framework-1.0~beta4.orig/applications/sofa/gui/qt/GraphVisitor.cpp
+++ sofa-framework-1.0~beta4/applications/sofa/gui/qt/GraphVisitor.cpp
@@ -207,10 +207,10 @@ namespace sofa
 	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 @@ namespace sofa
               }
 	    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;