Add warning for the working directory. Verify win64 fix.

This commit is contained in:
Lee Thomason 2012-03-24 12:49:03 -07:00
parent a3bdeeb110
commit 7f7b162b6f
3 changed files with 35 additions and 6 deletions

View File

@ -1408,9 +1408,14 @@ void XMLDocument::SaveFile( const char* filename )
#if defined(_MSC_VER) #if defined(_MSC_VER)
#pragma warning ( pop ) #pragma warning ( pop )
#endif #endif
XMLPrinter stream( fp ); if ( fp ) {
Print( &stream ); XMLPrinter stream( fp );
fclose( fp ); Print( &stream );
fclose( fp );
}
else {
SetError( XML_ERROR_FILE_COULD_NOT_BE_OPENED, filename, 0 );
}
} }

View File

@ -93,9 +93,9 @@ distribution.
#define TIXML_SSCANF sscanf #define TIXML_SSCANF sscanf
#endif #endif
static const int TIXML2_MAJOR_VERSION = 0; static const int TIXML2_MAJOR_VERSION = 0;
static const int TIXML2_MINOR_VERSION = 9; static const int TIXML2_MINOR_VERSION = 9;
static const int TIXML2_PATCH_VERSION = 1; static const int TIXML2_PATCH_VERSION = 1;
namespace tinyxml2 namespace tinyxml2
{ {
@ -736,6 +736,7 @@ enum {
XML_WRONG_ATTRIBUTE_TYPE, XML_WRONG_ATTRIBUTE_TYPE,
XML_ERROR_FILE_NOT_FOUND, XML_ERROR_FILE_NOT_FOUND,
XML_ERROR_FILE_COULD_NOT_BE_OPENED,
XML_ERROR_ELEMENT_MISMATCH, XML_ERROR_ELEMENT_MISMATCH,
XML_ERROR_PARSING_ELEMENT, XML_ERROR_PARSING_ELEMENT,
XML_ERROR_PARSING_ATTRIBUTE, XML_ERROR_PARSING_ATTRIBUTE,

View File

@ -77,6 +77,29 @@ int main( int /*argc*/, const char ** /*argv*/ )
_CrtMemCheckpoint( &startMemState ); _CrtMemCheckpoint( &startMemState );
#endif #endif
#if defined(_MSC_VER)
#pragma warning ( push )
#pragma warning ( disable : 4996 ) // Fail to see a compelling reason why this should be deprecated.
#endif
FILE* fp = fopen( "dream.xml", "r" );
if ( !fp ) {
printf( "Error opening test file 'dream.xml'.\n"
"Is your working directory the same as where \n"
"the xmltest.cpp and dream.xml file are?\n\n"
#if defined( _MSC_VER )
"In windows Visual Studio you may need to set\n"
"Properties->Debugging->Working Directory to '..'\n"
#endif
);
exit( 1 );
}
fclose( fp );
#if defined(_MSC_VER)
#pragma warning ( pop )
#endif
/* ------ Example 1: Load and parse an XML file. ---- */ /* ------ Example 1: Load and parse an XML file. ---- */
{ {
XMLDocument doc; XMLDocument doc;