Enable STL and restore original tinyxml licence

tinyxml/tinystr.cpp

@@ -36,71 +36,76 @@ TiXmlString::Rep TiXmlString::nullrep_ = { 0, 0, { '\0' } };
 
 void TiXmlString::reserve (size_type cap)
 {
-     if (cap > capacity()) {
-          TiXmlString tmp;
-          tmp.init(length(), cap);
-          memcpy(tmp.start(), data(), length());
-          swap(tmp);
-     }
+	if (cap > capacity())
+	{
+		TiXmlString tmp;
+		tmp.init(length(), cap);
+		memcpy(tmp.start(), data(), length());
+		swap(tmp);
+	}
 }
 
 
 TiXmlString& TiXmlString::assign(const char* str, size_type len)
 {
-     size_type cap = capacity();
-     if (len > cap || cap > 3*(len + 8)) {
-          TiXmlString tmp;
-          tmp.init(len);
-          memcpy(tmp.start(), str, len);
-          swap(tmp);
-     } else {
-          memmove(start(), str, len);
-          set_size(len);
-     }
-     return *this;
+	size_type cap = capacity();
+	if (len > cap || cap > 3*(len + 8))
+	{
+		TiXmlString tmp;
+		tmp.init(len);
+		memcpy(tmp.start(), str, len);
+		swap(tmp);
+	}
+	else
+	{
+		memmove(start(), str, len);
+		set_size(len);
+	}
+	return *this;
 }
 
 
 TiXmlString& TiXmlString::append(const char* str, size_type len)
 {
-     size_type newsize = length() + len;
-     if (newsize > capacity()) {
-          reserve (newsize + capacity());
-     }
-     memmove(finish(), str, len);
-     set_size(newsize);
-     return *this;
+	size_type newsize = length() + len;
+	if (newsize > capacity())
+	{
+		reserve (newsize + capacity());
+	}
+	memmove(finish(), str, len);
+	set_size(newsize);
+	return *this;
 }
 
 
 TiXmlString operator + (const TiXmlString & a, const TiXmlString & b)
 {
-     TiXmlString tmp;
-     tmp.reserve(a.length() + b.length());
-     tmp += a;
-     tmp += b;
-     return tmp;
+	TiXmlString tmp;
+	tmp.reserve(a.length() + b.length());
+	tmp += a;
+	tmp += b;
+	return tmp;
 }
 
 TiXmlString operator + (const TiXmlString & a, const char* b)
 {
-     TiXmlString tmp;
-     TiXmlString::size_type b_len = static_cast<TiXmlString::size_type>( strlen(b) );
-     tmp.reserve(a.length() + b_len);
-     tmp += a;
-     tmp.append(b, b_len);
-     return tmp;
+	TiXmlString tmp;
+	TiXmlString::size_type b_len = static_cast<TiXmlString::size_type>( strlen(b) );
+	tmp.reserve(a.length() + b_len);
+	tmp += a;
+	tmp.append(b, b_len);
+	return tmp;
 }
 
 TiXmlString operator + (const char* a, const TiXmlString & b)
 {
-     TiXmlString tmp;
-     TiXmlString::size_type a_len = static_cast<TiXmlString::size_type>( strlen(a) );
-     tmp.reserve(a_len + b.length());
-     tmp.append(a, a_len);
-     tmp += b;
-     return tmp;
+	TiXmlString tmp;
+	TiXmlString::size_type a_len = static_cast<TiXmlString::size_type>( strlen(a) );
+	tmp.reserve(a_len + b.length());
+	tmp.append(a, a_len);
+	tmp += b;
+	return tmp;
 }
 
 
-#endif  // TIXML_USE_STL
+#endif	// TIXML_USE_STL

tinyxml/tinyxmlerror.cpp

@@ -2,12 +2,12 @@
 www.sourceforge.net/projects/tinyxml
 Original code (2.0 and earlier )copyright (c) 2000-2006 Lee Thomason (www.grinninglizard.com)
 
-This software is provided 'as-is', without any express or implied
-warranty. In no event will the authors be held liable for any
+This software is provided 'as-is', without any express or implied 
+warranty. In no event will the authors be held liable for any 
 damages arising from the use of this software.
 
-Permission is granted to anyone to use this software for any
-purpose, including commercial applications, and to alter it and
+Permission is granted to anyone to use this software for any 
+purpose, including commercial applications, and to alter it and 
 redistribute it freely, subject to the following restrictions:
 
 1. The origin of this software must not be misrepresented; you must
@@ -31,21 +31,22 @@ distribution.
 // It also cleans up the code a bit.
 //
 
-const char* TiXmlBase::errorString[ TiXmlBase::TIXML_ERROR_STRING_COUNT ] = {
-     "No error",
-     "Error",
-     "Failed to open file",
-     "Error parsing Element.",
-     "Failed to read Element name",
-     "Error reading Element value.",
-     "Error reading Attributes.",
-     "Error: empty tag.",
-     "Error reading end tag.",
-     "Error parsing Unknown.",
-     "Error parsing Comment.",
-     "Error parsing Declaration.",
-     "Error document empty.",
-     "Error null (0) or unexpected EOF found in input stream.",
-     "Error parsing CDATA.",
-     "Error when TiXmlDocument added to document, because TiXmlDocument can only be at the root.",
+const char* TiXmlBase::errorString[ TiXmlBase::TIXML_ERROR_STRING_COUNT ] =
+{
+	"No error",
+	"Error",
+	"Failed to open file",
+	"Error parsing Element.",
+	"Failed to read Element name",
+	"Error reading Element value.",
+	"Error reading Attributes.",
+	"Error: empty tag.",
+	"Error reading end tag.",
+	"Error parsing Unknown.",
+	"Error parsing Comment.",
+	"Error parsing Declaration.",
+	"Error document empty.",
+	"Error null (0) or unexpected EOF found in input stream.",
+	"Error parsing CDATA.",
+	"Error when TiXmlDocument added to document, because TiXmlDocument can only be at the root.",
 };