6 files changed, 29 insertions, 0 deletions
diff --git a/engines/wintermute/tinyxml/tinystr.cpp b/engines/wintermute/tinyxml/tinystr.cpp
index 0665768205..81152d9017 100644
--- a/engines/wintermute/tinyxml/tinystr.cpp
+++ b/engines/wintermute/tinyxml/tinystr.cpp
@@ -21,11 +21,14 @@ must not be misrepresented as being the original software.
 distribution.
 */
 
+// Modified for use in ScummVM (namespace added)
 
 #ifndef TIXML_USE_STL
 
 #include "tinystr.h"
 
+namespace WinterMute {
+
 // Error value for find primitive
 const TiXmlString::size_type TiXmlString::npos = static_cast< TiXmlString::size_type >(-1);
 
@@ -107,5 +110,6 @@ TiXmlString operator + (const char* a, const TiXmlString & b)
 	return tmp;
 }
 
+} // end of namespace WinterMute
 
 #endif	// TIXML_USE_STL
diff --git a/engines/wintermute/tinyxml/tinystr.h b/engines/wintermute/tinyxml/tinystr.h
index 89cca33415..7f35f52864 100644
--- a/engines/wintermute/tinyxml/tinystr.h
+++ b/engines/wintermute/tinyxml/tinystr.h
@@ -21,6 +21,7 @@ must not be misrepresented as being the original software.
 distribution.
 */
 
+// Modified for use in ScummVM (namespace added)
 
 #ifndef TIXML_USE_STL
 
@@ -44,6 +45,7 @@ distribution.
 	#define TIXML_EXPLICIT
 #endif
 
+namespace WinterMute {
 
 /*
    TiXmlString is an emulation of a subset of the std::string template.
@@ -301,5 +303,7 @@ public :
 
 } ;
 
+} // end of namespace WinterMute
+
 #endif	// TIXML_STRING_INCLUDED
 #endif	// TIXML_USE_STL
diff --git a/engines/wintermute/tinyxml/tinyxml.cpp b/engines/wintermute/tinyxml/tinyxml.cpp
index e4a0c2780f..2ab6880a56 100644
--- a/engines/wintermute/tinyxml/tinyxml.cpp
+++ b/engines/wintermute/tinyxml/tinyxml.cpp
@@ -22,6 +22,8 @@ must not be misrepresented as being the original software.
 distribution.
 */
 
+// Modified for use in ScummVM (namespace added)
+
 #include <ctype.h>
 
 #ifdef TIXML_USE_STL
@@ -31,6 +33,7 @@ distribution.
 
 #include "engines/wintermute/tinyxml/tinyxml.h"
 
+namespace WinterMute {
 
 bool TiXmlBase::condenseWhiteSpace = true;
 
@@ -1886,3 +1889,4 @@ bool TiXmlPrinter::Visit( const TiXmlUnknown& unknown )
 	return true;
 }
 
+} // end of namespace WinterMute
diff --git a/engines/wintermute/tinyxml/tinyxml.h b/engines/wintermute/tinyxml/tinyxml.h
index afb07cfbed..a32e145587 100644
--- a/engines/wintermute/tinyxml/tinyxml.h
+++ b/engines/wintermute/tinyxml/tinyxml.h
@@ -22,6 +22,8 @@ must not be misrepresented as being the original software.
 distribution.
 */
 
+// Modified for ScummVM (namespace added)
+
 #undef TIXML_USE_STL
 
 #ifndef TINYXML_INCLUDED
@@ -83,6 +85,8 @@ distribution.
 	#endif
 #endif	
 
+namespace WinterMute {
+
 class TiXmlDocument;
 class TiXmlElement;
 class TiXmlComment;
@@ -1799,5 +1803,7 @@ private:
 #pragma warning( pop )
 #endif
 
+} // end of namespace WinterMute
+
 #endif
 
diff --git a/engines/wintermute/tinyxml/tinyxmlerror.cpp b/engines/wintermute/tinyxml/tinyxmlerror.cpp
index d24f63b2e5..ccfe4a039e 100644
--- a/engines/wintermute/tinyxml/tinyxmlerror.cpp
+++ b/engines/wintermute/tinyxml/tinyxmlerror.cpp
@@ -22,6 +22,8 @@ must not be misrepresented as being the original software.
 distribution.
 */
 
+// Modified for use in ScummVM (namespace added)
+
 #include "tinyxml.h"
 
 // The goal of the seperate error file is to make the first
@@ -31,6 +33,8 @@ distribution.
 // It also cleans up the code a bit.
 //
 
+namespace WinterMute {
+
 const char* TiXmlBase::errorString[ TIXML_ERROR_STRING_COUNT ] =
 {
 	"No error",
@@ -51,3 +55,5 @@ const char* TiXmlBase::errorString[ TIXML_ERROR_STRING_COUNT ] =
 	"Error parsing CDATA.",
 	"Error when TiXmlDocument added to document, because TiXmlDocument can only be at the root.",
 };
+
+} // end of namespace WinterMute
diff --git a/engines/wintermute/tinyxml/tinyxmlparser.cpp b/engines/wintermute/tinyxml/tinyxmlparser.cpp
index 14fd7c8c79..709dee0320 100644
--- a/engines/wintermute/tinyxml/tinyxmlparser.cpp
+++ b/engines/wintermute/tinyxml/tinyxmlparser.cpp
@@ -22,6 +22,8 @@ must not be misrepresented as being the original software.
 distribution.
 */
 
+// Modified for use in ScummVM (namespace added)
+
 #include <ctype.h>
 #include <stddef.h>
 
@@ -37,6 +39,8 @@ distribution.
 #	endif
 #endif
 
+namespace WinterMute {
+
 // Note tha "PutString" hardcodes the same list. This
 // is less flexible than it appears. Changing the entries
 // or order will break putstring.	
@@ -1636,3 +1640,4 @@ bool TiXmlText::Blank() const
 	return true;
 }
 
+} // end of namespace WinterMute