From 8553625730abec2467044b0bb2898b7c4f1114a3 Mon Sep 17 00:00:00 2001 From: Lee Thomason Date: Sat, 4 Jun 2016 19:10:53 -0700 Subject: [PATCH] one successful return type. simplify build on vs2015 --- tinyxml2.cpp | 16 ++++++++-------- tinyxml2.h | 3 +-- tinyxml2/test.vcxproj | 29 +++++++++++++---------------- tinyxml2/tinyxml2.vcxproj | 9 +-------- xmltest.cpp | 10 +++++----- 5 files changed, 28 insertions(+), 39 deletions(-) diff --git a/tinyxml2.cpp b/tinyxml2.cpp index 36f37de..bfd8d1f 100755 --- a/tinyxml2.cpp +++ b/tinyxml2.cpp @@ -1286,7 +1286,7 @@ void XMLAttribute::SetName( const char* n ) XMLError XMLAttribute::QueryIntValue( int* value ) const { if ( XMLUtil::ToInt( Value(), value )) { - return XML_NO_ERROR; + return XML_SUCCESS; } return XML_WRONG_ATTRIBUTE_TYPE; } @@ -1295,7 +1295,7 @@ XMLError XMLAttribute::QueryIntValue( int* value ) const XMLError XMLAttribute::QueryUnsignedValue( unsigned int* value ) const { if ( XMLUtil::ToUnsigned( Value(), value )) { - return XML_NO_ERROR; + return XML_SUCCESS; } return XML_WRONG_ATTRIBUTE_TYPE; } @@ -1304,7 +1304,7 @@ XMLError XMLAttribute::QueryUnsignedValue( unsigned int* value ) const XMLError XMLAttribute::QueryBoolValue( bool* value ) const { if ( XMLUtil::ToBool( Value(), value )) { - return XML_NO_ERROR; + return XML_SUCCESS; } return XML_WRONG_ATTRIBUTE_TYPE; } @@ -1313,7 +1313,7 @@ XMLError XMLAttribute::QueryBoolValue( bool* value ) const XMLError XMLAttribute::QueryFloatValue( float* value ) const { if ( XMLUtil::ToFloat( Value(), value )) { - return XML_NO_ERROR; + return XML_SUCCESS; } return XML_WRONG_ATTRIBUTE_TYPE; } @@ -1322,7 +1322,7 @@ XMLError XMLAttribute::QueryFloatValue( float* value ) const XMLError XMLAttribute::QueryDoubleValue( double* value ) const { if ( XMLUtil::ToDouble( Value(), value )) { - return XML_NO_ERROR; + return XML_SUCCESS; } return XML_WRONG_ATTRIBUTE_TYPE; } @@ -1771,7 +1771,7 @@ XMLDocument::XMLDocument( bool processEntities, Whitespace whitespace ) : XMLNode( 0 ), _writeBOM( false ), _processEntities( processEntities ), - _errorID( XML_NO_ERROR ), + _errorID(XML_SUCCESS), _whitespace( whitespace ), _errorStr1( 0 ), _errorStr2( 0 ), @@ -1795,7 +1795,7 @@ void XMLDocument::Clear() #ifdef DEBUG const bool hadError = Error(); #endif - _errorID = XML_NO_ERROR; + _errorID = XML_SUCCESS; _errorStr1 = 0; _errorStr2 = 0; @@ -2000,7 +2000,7 @@ XMLError XMLDocument::SaveFile( FILE* fp, bool compact ) { // Clear any error from the last save, otherwise it will get reported // for *this* call. - SetError( XML_NO_ERROR, 0, 0 ); + SetError(XML_SUCCESS, 0, 0); XMLPrinter stream( fp, compact ); Print( &stream ); return _errorID; diff --git a/tinyxml2.h b/tinyxml2.h index a0d2693..c6a1f87 100755 --- a/tinyxml2.h +++ b/tinyxml2.h @@ -485,7 +485,6 @@ public: // WARNING: must match XMLDocument::_errorNames[] enum XMLError { XML_SUCCESS = 0, - XML_NO_ERROR = 0, XML_NO_ATTRIBUTE, XML_WRONG_ATTRIBUTE_TYPE, XML_ERROR_FILE_NOT_FOUND, @@ -1673,7 +1672,7 @@ public: /// Return true if there was an error parsing the document. bool Error() const { - return _errorID != XML_NO_ERROR; + return _errorID != XML_SUCCESS; } /// Return the errorID. XMLError ErrorID() const { diff --git a/tinyxml2/test.vcxproj b/tinyxml2/test.vcxproj index b65b7c4..d46eb75 100644 --- a/tinyxml2/test.vcxproj +++ b/tinyxml2/test.vcxproj @@ -37,6 +37,7 @@ {E8FB2712-8666-4662-A5B8-2B5B0FB1A260} test + 8.1 @@ -133,29 +134,25 @@ + - $(SolutionDir)bin\$(Platform)-$(Configuration)\ - - - $(SolutionDir)temp\$(Platform)-$(Configuration)\ + $(SolutionDir)$(Configuration)\ + $(SolutionDir)$(Configuration)\ + - $(SolutionDir)bin\$(Platform)-$(Configuration)\ - - - $(SolutionDir)temp\$(Platform)-$(Configuration)\ + $(SolutionDir)$(Configuration)\ + $(SolutionDir)$(Configuration)\ + - $(SolutionDir)bin\$(Platform)-$(Configuration)\ - - - $(SolutionDir)temp\$(Platform)-$(Configuration)\ + $(SolutionDir)$(Configuration)\ + $(SolutionDir)$(Configuration)\ + - $(SolutionDir)bin\$(Platform)-$(Configuration)\ - - - $(SolutionDir)temp\$(Platform)-$(Configuration)\ + $(SolutionDir)$(Configuration)\ + $(SolutionDir)$(Configuration)\ $(SolutionDir)bin\$(Platform)-$(Configuration)\ diff --git a/tinyxml2/tinyxml2.vcxproj b/tinyxml2/tinyxml2.vcxproj index 73aac65..4c46354 100755 --- a/tinyxml2/tinyxml2.vcxproj +++ b/tinyxml2/tinyxml2.vcxproj @@ -38,6 +38,7 @@ {D1C528B6-AA02-4D29-9D61-DC08E317A70D} Win32Proj tinyxml2 + 8.1 @@ -140,13 +141,9 @@ true - $(SolutionDir)bin\$(Platform)-$(Configuration)\ - $(SolutionDir)temp\$(Platform)-$(Configuration)\ true - $(SolutionDir)bin\$(Platform)-$(Configuration)\ - $(SolutionDir)temp\$(Platform)-$(Configuration)\ true @@ -160,13 +157,9 @@ false - $(SolutionDir)bin\$(Platform)-$(Configuration)\ - $(SolutionDir)temp\$(Platform)-$(Configuration)\ false - $(SolutionDir)bin\$(Platform)-$(Configuration)\ - $(SolutionDir)temp\$(Platform)-$(Configuration)\ false diff --git a/xmltest.cpp b/xmltest.cpp index d9ccea3..78f072c 100644 --- a/xmltest.cpp +++ b/xmltest.cpp @@ -513,13 +513,13 @@ int main( int argc, const char ** argv ) double dVal; result = ele->QueryDoubleAttribute( "attr0", &dVal ); - XMLTest( "Query attribute: int as double", result, (int)XML_NO_ERROR ); + XMLTest( "Query attribute: int as double", result, (int)XML_SUCCESS); XMLTest( "Query attribute: int as double", (int)dVal, 1 ); result = ele->QueryDoubleAttribute( "attr1", &dVal ); - XMLTest( "Query attribute: double as double", result, (int)XML_NO_ERROR ); + XMLTest( "Query attribute: double as double", result, (int)XML_SUCCESS); XMLTest( "Query attribute: double as double", (int)dVal, 2 ); result = ele->QueryIntAttribute( "attr1", &iVal ); - XMLTest( "Query attribute: double as int", result, (int)XML_NO_ERROR ); + XMLTest( "Query attribute: double as int", result, (int)XML_SUCCESS); XMLTest( "Query attribute: double as int", iVal, 2 ); result = ele->QueryIntAttribute( "attr2", &iVal ); XMLTest( "Query attribute: not a number", result, (int)XML_WRONG_ATTRIBUTE_TYPE ); @@ -1003,7 +1003,7 @@ int main( int argc, const char ** argv ) { // This shouldn't crash. XMLDocument doc; - if(XML_NO_ERROR != doc.LoadFile( "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" )) + if(XML_SUCCESS != doc.LoadFile( "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" )) { doc.PrintError(); } @@ -1256,7 +1256,7 @@ int main( int argc, const char ** argv ) static const char* xml_bom_preservation = "\xef\xbb\xbf\n"; { XMLDocument doc; - XMLTest( "BOM preservation (parse)", XML_NO_ERROR, doc.Parse( xml_bom_preservation ), false ); + XMLTest( "BOM preservation (parse)", XML_SUCCESS, doc.Parse( xml_bom_preservation ), false ); XMLPrinter printer; doc.Print( &printer );