Changeset 8103 for code/branches/kicklib
- Timestamp:
- Mar 22, 2011, 3:22:54 PM (14 years ago)
- Location:
- code/branches/kicklib/src/external/tinyxml
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/kicklib/src/external/tinyxml/CMakeLists.txt
r7163 r8103 36 36 ORXONOX_EXTERNAL 37 37 NO_DLL_INTERFACE 38 VERSION39 2.5.340 38 SOURCE_FILES 41 39 ${TINYXML_FILES} -
code/branches/kicklib/src/external/tinyxml/VERSION
r6620 r8103 1 TinyXML++ trunk checkout revision 106. Built on top of TinyXML 2.5.3 1 TinyXML++ trunk checkout revision 122 (version 0.04a). 2 Built with TinyXML 2.5.3. -
code/branches/kicklib/src/external/tinyxml/changes_orxonox.diff
r5781 r8103 1 --- ticpp.h Tue Nov 4 21:55:49 2008 2 +++ ticpp.h Sat Jan 10 14:48:41 2009 3 @@ -1229,6 +1229,7 @@ 1 --- ticpp.h 2 +++ ticpp.h 3 @@ -38,9 +38,7 @@ 4 @todo add TYPECOUNT support. See ticpp::NodeFactory. 5 @todo Add a quick reference 6 */ 7 -#ifndef TIXML_USE_TICPP 8 - #define TIXML_USE_TICPP 9 -#endif 10 +#ifdef TIXML_USE_TICPP 11 12 #ifndef TICPP_INCLUDED 13 #define TICPP_INCLUDED 14 @@ -1231,6 +1229,7 @@ 4 15 5 16 T* m_tiXmlPointer; /**< Internal pointer to the TiXml Class which is being wrapped */ 6 17 7 + 18 + public: 8 19 /** 9 20 @internal 10 21 Gets the internal TinyXML pointer. 11 @@ -124 0,6 +1241,7 @@22 @@ -1242,6 +1241,7 @@ 12 23 ValidatePointer(); 13 24 return m_tiXmlPointer; 14 25 } 15 + 26 + protected: 16 27 17 28 /** 18 29 @internal 30 @@ -1903,3 +1903,5 @@ 31 } 32 33 #endif // TICPP_INCLUDED 34 + 35 +#endif // TIXML_USE_TICPP -
code/branches/kicklib/src/external/tinyxml/ticpp.cpp
r5781 r8103 370 370 } 371 371 372 Node* Node::InsertEndChild( Node& addThis )372 Node* Node::InsertEndChild( const Node& addThis ) 373 373 { 374 374 if ( addThis.Type() == TiXmlNode::DOCUMENT ) … … 404 404 } 405 405 406 Node* Node::InsertBeforeChild( Node* beforeThis, Node& addThis )406 Node* Node::InsertBeforeChild( Node* beforeThis, const Node& addThis ) 407 407 { 408 408 if ( addThis.Type() == TiXmlNode::DOCUMENT ) … … 423 423 } 424 424 425 Node* Node::InsertAfterChild( Node* afterThis, Node& addThis )425 Node* Node::InsertAfterChild( Node* afterThis, const Node& addThis ) 426 426 { 427 427 if ( addThis.Type() == TiXmlNode::DOCUMENT ) … … 442 442 } 443 443 444 Node* Node::ReplaceChild( Node* replaceThis, Node& withThis )444 Node* Node::ReplaceChild( Node* replaceThis, const Node& withThis ) 445 445 { 446 446 if ( withThis.Type() == TiXmlNode::DOCUMENT ) -
code/branches/kicklib/src/external/tinyxml/ticpp.h
r5781 r8103 225 225 return ( GetBasePointer() == rhs.GetBasePointer() ); 226 226 } 227 227 228 228 /** 229 229 Compare internal TiXml pointers to determine is both are wrappers around the same node … … 233 233 return ( GetBasePointer() != rhs.GetBasePointer() ); 234 234 } 235 235 236 236 /** 237 237 Builds detailed error string using TiXmlDocument::Error() and others … … 250 250 { 251 251 full_message << "\nDescription: " << doc->ErrorDesc() 252 << "\nFile: " << (strlen( doc->Value() ) > 0 ? doc->Value() : "<unnamed-file>") 253 << "\nLine: " << doc->ErrorRow() 252 << "\nFile: " << (strlen( doc->Value() ) > 0 ? doc->Value() : "<unnamed-file>") 253 << "\nLine: " << doc->ErrorRow() 254 254 << "\nColumn: " << doc->ErrorCol(); 255 255 } … … 287 287 TICPPTHROW( "Internal TiXml Pointer is NULL" ); 288 288 } 289 } 289 } 290 290 291 291 /** … … 617 617 @see TiXmlNode::InsertEndChild 618 618 */ 619 Node* InsertEndChild( Node& addThis );619 Node* InsertEndChild( const Node& addThis ); 620 620 621 621 /** … … 642 642 @see TiXmlNode::InsertBeforeChild 643 643 */ 644 Node* InsertBeforeChild( Node* beforeThis, Node& addThis );644 Node* InsertBeforeChild( Node* beforeThis, const Node& addThis ); 645 645 646 646 /** … … 655 655 @see TiXmlNode::InsertAfterChild 656 656 */ 657 Node* InsertAfterChild( Node* afterThis, Node& addThis );657 Node* InsertAfterChild( Node* afterThis, const Node& addThis ); 658 658 659 659 /** … … 667 667 @see TiXmlNode::ReplaceChild 668 668 */ 669 Node* ReplaceChild( Node* replaceThis, Node& withThis );669 Node* ReplaceChild( Node* replaceThis, const Node& withThis ); 670 670 671 671 /** … … 1163 1163 /** Sets internal pointer to the Previous Sibling, or Iterator::END, if there are no prior siblings */ 1164 1164 Iterator operator--(int) 1165 { 1165 { 1166 1166 Iterator tmp(*this); 1167 1167 --(*this); … … 1230 1230 T* m_tiXmlPointer; /**< Internal pointer to the TiXml Class which is being wrapped */ 1231 1231 1232 1232 public: 1233 1233 /** 1234 1234 @internal … … 1242 1242 return m_tiXmlPointer; 1243 1243 } 1244 1244 protected: 1245 1245 1246 1246 /** … … 1400 1400 1401 1401 /** 1402 Constructor. 1403 Create a document with a name. The name of the document is also the filename of the xml. 1404 1405 @param documentName Name to set in the Document. 1406 */ 1402 * Constructor. 1403 * Create a document with a name. The name of the document is also the filename of the xml. 1404 * @param documentName Name to set in the Document. 1405 * @note LoadFile() needs to be called to actually load the data from the file specified by documentName 1406 * SaveFile() needs to be called to save data to file specified by documentName. 1407 */ 1407 1408 Document( const std::string& documentName ); 1408 1409 … … 1749 1750 if ( throwIfNotFound ) 1750 1751 { 1751 TICPPTHROW( "Attribute does not exist" ); 1752 const std::string error( std::string( "Attribute '" ) + name + std::string( "' does not exist" ) ); 1753 TICPPTHROW( error ); 1752 1754 } 1753 1755 } … … 1781 1783 if ( throwIfNotFound ) 1782 1784 { 1783 TICPPTHROW( "Attribute does not exist" ); 1785 const std::string error( std::string( "Attribute '" ) + name + std::string( "' does not exist" ) ); 1786 TICPPTHROW( error ); 1784 1787 } 1785 1788 else
Note: See TracChangeset
for help on using the changeset viewer.