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

Eliminate warnings with GCC/MinGW

This commit is contained in:
MortenMacFly 2013-01-14 20:03:14 +01:00
parent f563fa1a29
commit 4ee49f1690
2 changed files with 31 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tinyxml2.cpp
View File

@ -326,6 +326,8 @@ void XMLUtil::ConvertUTF32ToUTF8( unsigned long input, char* output, int* length
case 1: case 1:
--output; --output;
*output = (char)(input | FIRST_BYTE_MARK[*length]); *output = (char)(input | FIRST_BYTE_MARK[*length]);
default:
break;
} }
} }
@ -1229,11 +1231,11 @@ const char* XMLElement::GetText() const
} }
XMLError XMLElement::QueryIntText( int* _value ) const XMLError XMLElement::QueryIntText( int* ival ) const
{ {
if ( FirstChild() && FirstChild()->ToText() ) { if ( FirstChild() && FirstChild()->ToText() ) {
const char* t = FirstChild()->ToText()->Value(); const char* t = FirstChild()->ToText()->Value();
if ( XMLUtil::ToInt( t, _value ) ) { if ( XMLUtil::ToInt( t, ival ) ) {
return XML_SUCCESS; return XML_SUCCESS;
} }
return XML_CAN_NOT_CONVERT_TEXT; return XML_CAN_NOT_CONVERT_TEXT;
@ -1242,11 +1244,11 @@ XMLError XMLElement::QueryIntText( int* _value ) const
} }
XMLError XMLElement::QueryUnsignedText( unsigned* _value ) const XMLError XMLElement::QueryUnsignedText( unsigned* uval ) const
{ {
if ( FirstChild() && FirstChild()->ToText() ) { if ( FirstChild() && FirstChild()->ToText() ) {
const char* t = FirstChild()->ToText()->Value(); const char* t = FirstChild()->ToText()->Value();
if ( XMLUtil::ToUnsigned( t, _value ) ) { if ( XMLUtil::ToUnsigned( t, uval ) ) {
return XML_SUCCESS; return XML_SUCCESS;
} }
return XML_CAN_NOT_CONVERT_TEXT; return XML_CAN_NOT_CONVERT_TEXT;
@ -1255,11 +1257,11 @@ XMLError XMLElement::QueryUnsignedText( unsigned* _value ) const
} }
XMLError XMLElement::QueryBoolText( bool* _value ) const XMLError XMLElement::QueryBoolText( bool* bval ) const
{ {
if ( FirstChild() && FirstChild()->ToText() ) { if ( FirstChild() && FirstChild()->ToText() ) {
const char* t = FirstChild()->ToText()->Value(); const char* t = FirstChild()->ToText()->Value();
if ( XMLUtil::ToBool( t, _value ) ) { if ( XMLUtil::ToBool( t, bval ) ) {
return XML_SUCCESS; return XML_SUCCESS;
} }
return XML_CAN_NOT_CONVERT_TEXT; return XML_CAN_NOT_CONVERT_TEXT;
@ -1268,11 +1270,11 @@ XMLError XMLElement::QueryBoolText( bool* _value ) const
} }
XMLError XMLElement::QueryDoubleText( double* _value ) const XMLError XMLElement::QueryDoubleText( double* dval ) const
{ {
if ( FirstChild() && FirstChild()->ToText() ) { if ( FirstChild() && FirstChild()->ToText() ) {
const char* t = FirstChild()->ToText()->Value(); const char* t = FirstChild()->ToText()->Value();
if ( XMLUtil::ToDouble( t, _value ) ) { if ( XMLUtil::ToDouble( t, dval ) ) {
return XML_SUCCESS; return XML_SUCCESS;
} }
return XML_CAN_NOT_CONVERT_TEXT; return XML_CAN_NOT_CONVERT_TEXT;
@ -1281,11 +1283,11 @@ XMLError XMLElement::QueryDoubleText( double* _value ) const
} }
XMLError XMLElement::QueryFloatText( float* _value ) const XMLError XMLElement::QueryFloatText( float* fval ) const
{ {
if ( FirstChild() && FirstChild()->ToText() ) { if ( FirstChild() && FirstChild()->ToText() ) {
const char* t = FirstChild()->ToText()->Value(); const char* t = FirstChild()->ToText()->Value();
if ( XMLUtil::ToFloat( t, _value ) ) { if ( XMLUtil::ToFloat( t, fval ) ) {
return XML_SUCCESS; return XML_SUCCESS;
} }
return XML_CAN_NOT_CONVERT_TEXT; return XML_CAN_NOT_CONVERT_TEXT;

10
tinyxml2.h
View File

@ -1301,15 +1301,15 @@ public:
to the requested type, and XML_NO_TEXT_NODE if there is no child text to query. to the requested type, and XML_NO_TEXT_NODE if there is no child text to query.
*/ */
XMLError QueryIntText( int* _value ) const; XMLError QueryIntText( int* ival ) const;
/// See QueryIntText() /// See QueryIntText()
XMLError QueryUnsignedText( unsigned* _value ) const; XMLError QueryUnsignedText( unsigned* uval ) const;
/// See QueryIntText() /// See QueryIntText()
XMLError QueryBoolText( bool* _value ) const; XMLError QueryBoolText( bool* bval ) const;
/// See QueryIntText() /// See QueryIntText()
XMLError QueryDoubleText( double* _value ) const; XMLError QueryDoubleText( double* dval ) const;
/// See QueryIntText() /// See QueryIntText()
XMLError QueryFloatText( float* _value ) const; XMLError QueryFloatText( float* fval ) const;
// internal: // internal:
enum { enum {