|
@@ -98,9 +98,9 @@ inline int TIXML_SNPRINTF( char* buffer, size_t size, const char* format, ... )
|
|
|
#define TIXML_SSCANF sscanf
|
|
#define TIXML_SSCANF sscanf
|
|
|
#endif
|
|
#endif
|
|
|
|
|
|
|
|
-static const int TIXML2_MAJOR_VERSION = 1;
|
|
|
|
|
-static const int TIXML2_MINOR_VERSION = 0;
|
|
|
|
|
-static const int TIXML2_PATCH_VERSION = 11;
|
|
|
|
|
|
|
+static const int TIXML2_MAJOR_VERSION = 1;
|
|
|
|
|
+static const int TIXML2_MINOR_VERSION = 0;
|
|
|
|
|
+static const int TIXML2_PATCH_VERSION = 11;
|
|
|
|
|
|
|
|
namespace tinyxml2
|
|
namespace tinyxml2
|
|
|
{
|
|
{
|
|
@@ -127,14 +127,14 @@ public:
|
|
|
enum {
|
|
enum {
|
|
|
NEEDS_ENTITY_PROCESSING = 0x01,
|
|
NEEDS_ENTITY_PROCESSING = 0x01,
|
|
|
NEEDS_NEWLINE_NORMALIZATION = 0x02,
|
|
NEEDS_NEWLINE_NORMALIZATION = 0x02,
|
|
|
- COLLAPSE_WHITESPACE = 0x04,
|
|
|
|
|
|
|
+ COLLAPSE_WHITESPACE = 0x04,
|
|
|
|
|
|
|
|
- TEXT_ELEMENT = NEEDS_ENTITY_PROCESSING | NEEDS_NEWLINE_NORMALIZATION,
|
|
|
|
|
|
|
+ TEXT_ELEMENT = NEEDS_ENTITY_PROCESSING | NEEDS_NEWLINE_NORMALIZATION,
|
|
|
TEXT_ELEMENT_LEAVE_ENTITIES = NEEDS_NEWLINE_NORMALIZATION,
|
|
TEXT_ELEMENT_LEAVE_ENTITIES = NEEDS_NEWLINE_NORMALIZATION,
|
|
|
- ATTRIBUTE_NAME = 0,
|
|
|
|
|
- ATTRIBUTE_VALUE = NEEDS_ENTITY_PROCESSING | NEEDS_NEWLINE_NORMALIZATION,
|
|
|
|
|
- ATTRIBUTE_VALUE_LEAVE_ENTITIES = NEEDS_NEWLINE_NORMALIZATION,
|
|
|
|
|
- COMMENT = NEEDS_NEWLINE_NORMALIZATION
|
|
|
|
|
|
|
+ ATTRIBUTE_NAME = 0,
|
|
|
|
|
+ ATTRIBUTE_VALUE = NEEDS_ENTITY_PROCESSING | NEEDS_NEWLINE_NORMALIZATION,
|
|
|
|
|
+ ATTRIBUTE_VALUE_LEAVE_ENTITIES = NEEDS_NEWLINE_NORMALIZATION,
|
|
|
|
|
+ COMMENT = NEEDS_NEWLINE_NORMALIZATION
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
StrPair() : _flags( 0 ), _start( 0 ), _end( 0 ) {}
|
|
StrPair() : _flags( 0 ), _start( 0 ), _end( 0 ) {}
|
|
@@ -172,7 +172,7 @@ private:
|
|
|
NEEDS_DELETE = 0x200
|
|
NEEDS_DELETE = 0x200
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
- // After parsing, if *end != 0, it can be set to zero.
|
|
|
|
|
|
|
+ // After parsing, if *_end != 0, it can be set to zero.
|
|
|
int _flags;
|
|
int _flags;
|
|
|
char* _start;
|
|
char* _start;
|
|
|
char* _end;
|
|
char* _end;
|