AxioDL
/
tinyxml2
mirror of https://github.com/AxioDL/tinyxml2.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #596 from Dmitry-Me/useValidPointerForUserData 

Use valid pointer for user data
This commit is contained in:
Lee Thomason 2017-08-10 15:06:26 -07:00 committed by GitHub
parent 82e20b1831 7d8dfb9ee2
commit cd453f86e8
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
xmltest.cpp
View File

@ -439,8 +439,12 @@ int main( int argc, const char ** argv )
sub[i]->SetAttribute( "attrib", i ); sub[i]->SetAttribute( "attrib", i );
} }
element->InsertEndChild( sub[2] ); element->InsertEndChild( sub[2] );
const int dummyInitialValue = 1000;
int dummyValue = dummyInitialValue;
XMLNode* comment = element->InsertFirstChild( doc->NewComment( "comment" ) ); XMLNode* comment = element->InsertFirstChild( doc->NewComment( "comment" ) );
comment->SetUserData((void*)2); comment->SetUserData(&dummyValue);
element->InsertAfterChild( comment, sub[0] ); element->InsertAfterChild( comment, sub[0] );
element->InsertAfterChild( sub[0], sub[1] ); element->InsertAfterChild( sub[0], sub[1] );
sub[2]->InsertFirstChild( doc->NewText( "& Text!" )); sub[2]->InsertFirstChild( doc->NewText( "& Text!" ));
@ -450,7 +454,8 @@ int main( int argc, const char ** argv )
XMLTest( "Programmatic DOM", 2, doc->FirstChildElement()->LastChildElement( "sub" )->IntAttribute( "attrib" ) ); XMLTest( "Programmatic DOM", 2, doc->FirstChildElement()->LastChildElement( "sub" )->IntAttribute( "attrib" ) );
XMLTest( "Programmatic DOM", "& Text!", XMLTest( "Programmatic DOM", "& Text!",
doc->FirstChildElement()->LastChildElement( "sub" )->FirstChild()->ToText()->Value() ); doc->FirstChildElement()->LastChildElement( "sub" )->FirstChild()->ToText()->Value() );
XMLTest("User data", (void*)2 == comment->GetUserData(), true, false); XMLTest("User data", true, &dummyValue == comment->GetUserData(), false);
XMLTest("User data", dummyInitialValue, dummyValue, false);
// And now deletion: // And now deletion:
element->DeleteChild( sub[2] ); element->DeleteChild( sub[2] );