changing namespace of tinyxml2

Davide Faconti · Davide Faconti · commit 75af6abfc86d · 2019-03-29T10:59:03.000+01:00
diff --git a/3rdparty/tinyXML2/tinyxml2.cpp b/3rdparty/tinyXML2/tinyxml2.cpp
@@ -116,7 +116,7 @@ static const unsigned char TIXML_UTF_LEAD_0 = 0xefU;
 static const unsigned char TIXML_UTF_LEAD_1 = 0xbbU;
 static const unsigned char TIXML_UTF_LEAD_2 = 0xbfU;
 
-namespace tinyxml2
+namespace BT_TinyXML2
 {
 
 struct Entity {
diff --git a/3rdparty/tinyXML2/tinyxml2.h b/3rdparty/tinyXML2/tinyxml2.h
@@ -113,7 +113,7 @@ static const int TIXML2_PATCH_VERSION = 1;
 // so there needs to be a limit in place.
 static const int TINYXML2_MAX_ELEMENT_DEPTH = 100;
 
-namespace tinyxml2
+namespace BT_TinyXML2
 {
 class XMLDocument;
 class XMLElement;
diff --git a/src/xml_parsing.cpp b/src/xml_parsing.cpp
@@ -35,7 +35,7 @@
 
 namespace BT
 {
-using namespace tinyxml2;
+using namespace BT_TinyXML2;
 
 struct XMLParser::Pimpl
 {
@@ -48,9 +48,9 @@ struct XMLParser::Pimpl
                                Blackboard::Ptr blackboard,
                                const TreeNode::Ptr& root_parent);
 
-    void loadDocImpl(tinyxml2::XMLDocument* doc);
+    void loadDocImpl(BT_TinyXML2::XMLDocument* doc);
 
-    std::list<std::unique_ptr<tinyxml2::XMLDocument> > opened_documents;
+    std::list<std::unique_ptr<BT_TinyXML2::XMLDocument> > opened_documents;
     std::unordered_map<std::string,const XMLElement*>  tree_roots;
 
     const BehaviorTreeFactory& factory;
@@ -91,9 +91,9 @@ XMLParser::~XMLParser()
 
 void XMLParser::loadFromFile(const std::string& filename)
 {
-    _p->opened_documents.emplace_back(new tinyxml2::XMLDocument());
+    _p->opened_documents.emplace_back(new BT_TinyXML2::XMLDocument());
 
-    tinyxml2::XMLDocument* doc = _p->opened_documents.back().get();
+    BT_TinyXML2::XMLDocument* doc = _p->opened_documents.back().get();
     doc->LoadFile(filename.c_str());
 
     filesystem::path file_path( filename );
@@ -104,15 +104,15 @@ void XMLParser::loadFromFile(const std::string& filename)
 
 void XMLParser::loadFromText(const std::string& xml_text)
 {
-    _p->opened_documents.emplace_back(new tinyxml2::XMLDocument());
+    _p->opened_documents.emplace_back(new BT_TinyXML2::XMLDocument());
 
-    tinyxml2::XMLDocument* doc = _p->opened_documents.back().get();
+    BT_TinyXML2::XMLDocument* doc = _p->opened_documents.back().get();
     doc->Parse(xml_text.c_str(), xml_text.size());
 
     _p->loadDocImpl( doc );
 }
 
-void XMLParser::Pimpl::loadDocImpl(tinyxml2::XMLDocument* doc)
+void XMLParser::Pimpl::loadDocImpl(BT_TinyXML2::XMLDocument* doc)
 {
     if (doc->Error())
     {
@@ -154,8 +154,8 @@ void XMLParser::Pimpl::loadDocImpl(tinyxml2::XMLDocument* doc)
             file_path = current_path / file_path;
         }
 
-        opened_documents.emplace_back(new tinyxml2::XMLDocument());
-        tinyxml2::XMLDocument* next_doc = opened_documents.back().get();
+        opened_documents.emplace_back(new BT_TinyXML2::XMLDocument());
+        BT_TinyXML2::XMLDocument* next_doc = opened_documents.back().get();
         next_doc->LoadFile(file_path.str().c_str());
         loadDocImpl(next_doc);
     }
@@ -196,7 +196,7 @@ void VerifyXML(const std::string& xml_text,
                const std::set<std::string>& registered_nodes)
 {
 
-    tinyxml2::XMLDocument doc;
+    BT_TinyXML2::XMLDocument doc;
     auto xml_error = doc.Parse( xml_text.c_str(), xml_text.size());
     if (xml_error)
     {
@@ -648,9 +648,9 @@ void BT::XMLParser::Pimpl::recursivelyCreateTree(const std::string& tree_ID,
 
 std::string writeTreeNodesModelXML(const BehaviorTreeFactory& factory)
 {
-    using namespace tinyxml2;
+    using namespace BT_TinyXML2;
 
-    tinyxml2::XMLDocument doc;
+    BT_TinyXML2::XMLDocument doc;
 
     XMLElement* rootXML = doc.NewElement("root");
     doc.InsertFirstChild(rootXML);

Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ static const unsigned char TIXML_UTF_LEAD_0 = 0xefU;`
`116`	`116`	`static const unsigned char TIXML_UTF_LEAD_1 = 0xbbU;`
`117`	`117`	`static const unsigned char TIXML_UTF_LEAD_2 = 0xbfU;`
`118`	`118`
`119`		`-namespace tinyxml2`
	`119`	`+namespace BT_TinyXML2`
`120`	`120`	`{`
`121`	`121`
`122`	`122`	`struct Entity {`
Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ static const int TIXML2_PATCH_VERSION = 1;`
`113`	`113`	`// so there needs to be a limit in place.`
`114`	`114`	`static const int TINYXML2_MAX_ELEMENT_DEPTH = 100;`
`115`	`115`
`116`		`-namespace tinyxml2`
	`116`	`+namespace BT_TinyXML2`
`117`	`117`	`{`
`118`	`118`	`class XMLDocument;`
`119`	`119`	`class XMLElement;`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@`
`35`	`35`
`36`	`36`	`namespace BT`
`37`	`37`	`{`
`38`		`-using namespace tinyxml2;`
	`38`	`+using namespace BT_TinyXML2;`
`39`	`39`
`40`	`40`	`struct XMLParser::Pimpl`
`41`	`41`	`{`
`@@ -48,9 +48,9 @@ struct XMLParser::Pimpl`
`48`	`48`	`Blackboard::Ptr blackboard,`
`49`	`49`	`const TreeNode::Ptr& root_parent);`
`50`	`50`
`51`		`- void loadDocImpl(tinyxml2::XMLDocument* doc);`
	`51`	`+ void loadDocImpl(BT_TinyXML2::XMLDocument* doc);`
`52`	`52`
`53`		`- std::list<std::unique_ptr<tinyxml2::XMLDocument> > opened_documents;`
	`53`	`+ std::list<std::unique_ptr<BT_TinyXML2::XMLDocument> > opened_documents;`
`54`	`54`	`std::unordered_map<std::string,const XMLElement*> tree_roots;`
`55`	`55`
`56`	`56`	`const BehaviorTreeFactory& factory;`
`@@ -91,9 +91,9 @@ XMLParser::~XMLParser()`
`91`	`91`
`92`	`92`	`void XMLParser::loadFromFile(const std::string& filename)`
`93`	`93`	`{`
`94`		`- _p->opened_documents.emplace_back(new tinyxml2::XMLDocument());`
	`94`	`+ _p->opened_documents.emplace_back(new BT_TinyXML2::XMLDocument());`
`95`	`95`
`96`		`- tinyxml2::XMLDocument* doc = _p->opened_documents.back().get();`
	`96`	`+ BT_TinyXML2::XMLDocument* doc = _p->opened_documents.back().get();`
`97`	`97`	`doc->LoadFile(filename.c_str());`
`98`	`98`
`99`	`99`	`filesystem::path file_path( filename );`
`@@ -104,15 +104,15 @@ void XMLParser::loadFromFile(const std::string& filename)`
`104`	`104`
`105`	`105`	`void XMLParser::loadFromText(const std::string& xml_text)`
`106`	`106`	`{`
`107`		`- _p->opened_documents.emplace_back(new tinyxml2::XMLDocument());`
	`107`	`+ _p->opened_documents.emplace_back(new BT_TinyXML2::XMLDocument());`
`108`	`108`
`109`		`- tinyxml2::XMLDocument* doc = _p->opened_documents.back().get();`
	`109`	`+ BT_TinyXML2::XMLDocument* doc = _p->opened_documents.back().get();`
`110`	`110`	`doc->Parse(xml_text.c_str(), xml_text.size());`
`111`	`111`
`112`	`112`	`_p->loadDocImpl( doc );`
`113`	`113`	`}`
`114`	`114`
`115`		`-void XMLParser::Pimpl::loadDocImpl(tinyxml2::XMLDocument* doc)`
	`115`	`+void XMLParser::Pimpl::loadDocImpl(BT_TinyXML2::XMLDocument* doc)`
`116`	`116`	`{`
`117`	`117`	`if (doc->Error())`
`118`	`118`	`{`
`@@ -154,8 +154,8 @@ void XMLParser::Pimpl::loadDocImpl(tinyxml2::XMLDocument* doc)`
`154`	`154`	`file_path = current_path / file_path;`
`155`	`155`	`}`
`156`	`156`
`157`		`- opened_documents.emplace_back(new tinyxml2::XMLDocument());`
`158`		`- tinyxml2::XMLDocument* next_doc = opened_documents.back().get();`
	`157`	`+ opened_documents.emplace_back(new BT_TinyXML2::XMLDocument());`
	`158`	`+ BT_TinyXML2::XMLDocument* next_doc = opened_documents.back().get();`
`159`	`159`	`next_doc->LoadFile(file_path.str().c_str());`
`160`	`160`	`loadDocImpl(next_doc);`
`161`	`161`	`}`
`@@ -196,7 +196,7 @@ void VerifyXML(const std::string& xml_text,`
`196`	`196`	`const std::set<std::string>& registered_nodes)`
`197`	`197`	`{`
`198`	`198`
`199`		`- tinyxml2::XMLDocument doc;`
	`199`	`+ BT_TinyXML2::XMLDocument doc;`
`200`	`200`	`auto xml_error = doc.Parse( xml_text.c_str(), xml_text.size());`
`201`	`201`	`if (xml_error)`
`202`	`202`	`{`
`@@ -648,9 +648,9 @@ void BT::XMLParser::Pimpl::recursivelyCreateTree(const std::string& tree_ID,`
`648`	`648`
`649`	`649`	`std::string writeTreeNodesModelXML(const BehaviorTreeFactory& factory)`
`650`	`650`	`{`
`651`		`- using namespace tinyxml2;`
	`651`	`+ using namespace BT_TinyXML2;`
`652`	`652`
`653`		`- tinyxml2::XMLDocument doc;`
	`653`	`+ BT_TinyXML2::XMLDocument doc;`
`654`	`654`
`655`	`655`	`XMLElement* rootXML = doc.NewElement("root");`
`656`	`656`	`doc.InsertFirstChild(rootXML);`