Skip to content

Commit

Permalink
Merge remote-tracking branch 'TC01/tinyxml-update' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
lethosor committed Dec 14, 2016
2 parents 439e136 + 144675c commit b879efe
Show file tree
Hide file tree
Showing 6 changed files with 312 additions and 331 deletions.
5 changes: 0 additions & 5 deletions depends/tinyxml/tinystr.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
/*
www.sourceforge.net/projects/tinyxml
Original file by Yves Berquin.
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any
Expand All @@ -22,10 +21,6 @@ must not be misrepresented as being the original software.
distribution.
*/

/*
* THIS FILE WAS ALTERED BY Tyge Løvset, 7. April 2005.
*/


#ifndef TIXML_USE_STL

Expand Down
14 changes: 0 additions & 14 deletions depends/tinyxml/tinystr.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
/*
www.sourceforge.net/projects/tinyxml
Original file by Yves Berquin.
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any
Expand All @@ -22,17 +21,6 @@ must not be misrepresented as being the original software.
distribution.
*/

/*
* THIS FILE WAS ALTERED BY Tyge Lovset, 7. April 2005.
*
* - completely rewritten. compact, clean, and fast implementation.
* - sizeof(TiXmlString) = pointer size (4 bytes on 32-bit systems)
* - fixed reserve() to work as per specification.
* - fixed buggy compares operator==(), operator<(), and operator>()
* - fixed operator+=() to take a const ref argument, following spec.
* - added "copy" constructor with length, and most compare operators.
* - added swap(), clear(), size(), capacity(), operator+().
*/

#ifndef TIXML_USE_STL

Expand Down Expand Up @@ -106,13 +94,11 @@ class TiXmlString
quit();
}

// = operator
TiXmlString& operator = (const char * copy)
{
return assign( copy, (size_type)strlen(copy));
}

// = operator
TiXmlString& operator = (const TiXmlString & copy)
{
return assign(copy.start(), copy.length());
Expand Down
Loading

0 comments on commit b879efe

Please sign in to comment.