| tinyxml.h | tinyxml.h | |||
|---|---|---|---|---|
| skipping to change at line 65 | skipping to change at line 65 | |||
| // Deprecated library function hell. Compilers want to use the | // Deprecated library function hell. Compilers want to use the | |||
| // new safe versions. This probably doesn't fully address the problem, | // new safe versions. This probably doesn't fully address the problem, | |||
| // but it gets closer. There are too many compilers for me to fully | // but it gets closer. There are too many compilers for me to fully | |||
| // test. If you get compilation troubles, undefine TIXML_SAFE | // test. If you get compilation troubles, undefine TIXML_SAFE | |||
| #define TIXML_SAFE | #define TIXML_SAFE | |||
| #ifdef TIXML_SAFE | #ifdef TIXML_SAFE | |||
| #if defined(_MSC_VER) && (_MSC_VER >= 1400 ) | #if defined(_MSC_VER) && (_MSC_VER >= 1400 ) | |||
| // Microsoft visual studio, version 2005 and higher. | // Microsoft visual studio, version 2005 and higher. | |||
| #define TIXML_SNPRINTF _snprintf_s | #define TIXML_SNPRINTF _snprintf_s | |||
| #define TIXML_SNSCANF _snscanf_s | ||||
| #define TIXML_SSCANF sscanf_s | #define TIXML_SSCANF sscanf_s | |||
| #elif defined(_MSC_VER) && (_MSC_VER >= 1200 ) | #elif defined(_MSC_VER) && (_MSC_VER >= 1200 ) | |||
| // Microsoft visual studio, version 6 and higher. | // Microsoft visual studio, version 6 and higher. | |||
| //#pragma message( "Using _sn* functions." ) | //#pragma message( "Using _sn* functions." ) | |||
| #define TIXML_SNPRINTF _snprintf | #define TIXML_SNPRINTF _snprintf | |||
| #define TIXML_SNSCANF _snscanf | ||||
| #define TIXML_SSCANF sscanf | #define TIXML_SSCANF sscanf | |||
| #elif defined(__GNUC__) && (__GNUC__ >= 3 ) | #elif defined(__GNUC__) && (__GNUC__ >= 3 ) | |||
| // GCC version 3 and higher.s | // GCC version 3 and higher.s | |||
| //#warning( "Using sn* functions." ) | //#warning( "Using sn* functions." ) | |||
| #define TIXML_SNPRINTF snprintf | #define TIXML_SNPRINTF snprintf | |||
| #define TIXML_SNSCANF snscanf | ||||
| #define TIXML_SSCANF sscanf | #define TIXML_SSCANF sscanf | |||
| #else | #else | |||
| #define TIXML_SNPRINTF snprintf | ||||
| #define TIXML_SSCANF sscanf | #define TIXML_SSCANF sscanf | |||
| #endif | #endif | |||
| #endif | #endif | |||
| class TiXmlDocument; | class TiXmlDocument; | |||
| class TiXmlElement; | class TiXmlElement; | |||
| class TiXmlComment; | class TiXmlComment; | |||
| class TiXmlUnknown; | class TiXmlUnknown; | |||
| class TiXmlAttribute; | class TiXmlAttribute; | |||
| class TiXmlText; | class TiXmlText; | |||
| class TiXmlDeclaration; | class TiXmlDeclaration; | |||
| class TiXmlParsingData; | class TiXmlParsingData; | |||
| const int TIXML_MAJOR_VERSION = 2; | const int TIXML_MAJOR_VERSION = 2; | |||
| const int TIXML_MINOR_VERSION = 6; | const int TIXML_MINOR_VERSION = 6; | |||
| const int TIXML_PATCH_VERSION = 0; | const int TIXML_PATCH_VERSION = 1; | |||
| /* Internal structure for tracking location of items | /* Internal structure for tracking location of items | |||
| in the XML file. | in the XML file. | |||
| */ | */ | |||
| struct TiXmlCursor | struct TiXmlCursor | |||
| { | { | |||
| TiXmlCursor() { Clear(); } | TiXmlCursor() { Clear(); } | |||
| void Clear() { row = col = -1; } | void Clear() { row = col = -1; } | |||
| int row; // 0 based. | int row; // 0 based. | |||
| End of changes. 5 change blocks. | ||||
| 4 lines changed or deleted | 2 lines changed or added | |||