commit 4ee49f169093c71b9e964ae3b19709c8330848e0
author MortenMacFly <mac-fly@gmx.net> Mon Jan 14 20:03:14 2013 +0100
committer MortenMacFly <mac-fly@gmx.net> Mon Jan 14 20:03:14 2013 +0100
tree 9d6461dc3f265161c70ebae686eaf2b154b48d9d
parent f563fa1a29d4f879dda6fe5ee9efa227f73245c2

Eliminate warnings with GCC/MinGW

tinyxml2.cpp

diff --git a/tinyxml2.cpp b/tinyxml2.cpp
index 61e9b58..647901b 100755
--- a/tinyxml2.cpp
+++ b/tinyxml2.cpp
@@ -326,6 +326,8 @@
         case 1:

             --output;

             *output = (char)(input | FIRST_BYTE_MARK[*length]);

+        default:

+            break;

     }

 }

 

@@ -1229,11 +1231,11 @@
 }

 

 

-XMLError XMLElement::QueryIntText( int* _value ) const

+XMLError XMLElement::QueryIntText( int* ival ) const

 {

     if ( FirstChild() && FirstChild()->ToText() ) {

         const char* t = FirstChild()->ToText()->Value();

-        if ( XMLUtil::ToInt( t, _value ) ) {

+        if ( XMLUtil::ToInt( t, ival ) ) {

             return XML_SUCCESS;

         }

         return XML_CAN_NOT_CONVERT_TEXT;

@@ -1242,11 +1244,11 @@
 }

 

 

-XMLError XMLElement::QueryUnsignedText( unsigned* _value ) const

+XMLError XMLElement::QueryUnsignedText( unsigned* uval ) const

 {

     if ( FirstChild() && FirstChild()->ToText() ) {

         const char* t = FirstChild()->ToText()->Value();

-        if ( XMLUtil::ToUnsigned( t, _value ) ) {

+        if ( XMLUtil::ToUnsigned( t, uval ) ) {

             return XML_SUCCESS;

         }

         return XML_CAN_NOT_CONVERT_TEXT;

@@ -1255,11 +1257,11 @@
 }

 

 

-XMLError XMLElement::QueryBoolText( bool* _value ) const

+XMLError XMLElement::QueryBoolText( bool* bval ) const

 {

     if ( FirstChild() && FirstChild()->ToText() ) {

         const char* t = FirstChild()->ToText()->Value();

-        if ( XMLUtil::ToBool( t, _value ) ) {

+        if ( XMLUtil::ToBool( t, bval ) ) {

             return XML_SUCCESS;

         }

         return XML_CAN_NOT_CONVERT_TEXT;

@@ -1268,11 +1270,11 @@
 }

 

 

-XMLError XMLElement::QueryDoubleText( double* _value ) const

+XMLError XMLElement::QueryDoubleText( double* dval ) const

 {

     if ( FirstChild() && FirstChild()->ToText() ) {

         const char* t = FirstChild()->ToText()->Value();

-        if ( XMLUtil::ToDouble( t, _value ) ) {

+        if ( XMLUtil::ToDouble( t, dval ) ) {

             return XML_SUCCESS;

         }

         return XML_CAN_NOT_CONVERT_TEXT;

@@ -1281,11 +1283,11 @@
 }

 

 

-XMLError XMLElement::QueryFloatText( float* _value ) const

+XMLError XMLElement::QueryFloatText( float* fval ) const

 {

     if ( FirstChild() && FirstChild()->ToText() ) {

         const char* t = FirstChild()->ToText()->Value();

-        if ( XMLUtil::ToFloat( t, _value ) ) {

+        if ( XMLUtil::ToFloat( t, fval ) ) {

             return XML_SUCCESS;

         }

         return XML_CAN_NOT_CONVERT_TEXT;