AxioDL/tinyxml2
2
0
Fork 0
mirror of https://github.com/AxioDL/tinyxml2.git synced 2025-05-15 11:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

std lib is in std:: namespace only and array definition is not possible with an enum

Browse Source
This commit is contained in:
Jerome Martinez 2012-10-19 11:30:33 +02:00
parent 1aa8fc4a1e
commit 7fbefab95d
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tinyxml2.cpp
View File

@ -31,6 +31,7 @@ distribution.
#endif #endif
using namespace tinyxml2; using namespace tinyxml2;
using namespace std;
static const char LINE_FEED = (char)0x0a; // all line endings are normalized to LF static const char LINE_FEED = (char)0x0a; // all line endings are normalized to LF
static const char LF = LINE_FEED; static const char LF = LINE_FEED;

20
tinyxml2.h
View File

@ -356,7 +356,7 @@ private:
char mem[SIZE]; char mem[SIZE];
}; };
struct Block { struct Block {
Chunk chunk[COUNT]; Chunk chunk[1024/SIZE];
}; };
DynArray< Block*, 10 > _blockPtrs; DynArray< Block*, 10 > _blockPtrs;
Chunk* _root; Chunk* _root;
@ -438,19 +438,19 @@ public:
// Anything in the high order range of UTF-8 is assumed to not be whitespace. This isn't // Anything in the high order range of UTF-8 is assumed to not be whitespace. This isn't
// correct, but simple, and usually works. // correct, but simple, and usually works.
static const char* SkipWhiteSpace( const char* p ) { static const char* SkipWhiteSpace( const char* p ) {
while( !IsUTF8Continuation(*p) && isspace( *reinterpret_cast<const unsigned char*>(p) ) ) { while( !IsUTF8Continuation(*p) && std::isspace( *reinterpret_cast<const unsigned char*>(p) ) ) {
++p; ++p;
} }
return p; return p;
} }
static char* SkipWhiteSpace( char* p ) { static char* SkipWhiteSpace( char* p ) {
while( !IsUTF8Continuation(*p) && isspace( *reinterpret_cast<unsigned char*>(p) ) ) { while( !IsUTF8Continuation(*p) && std::isspace( *reinterpret_cast<unsigned char*>(p) ) ) {
++p; ++p;
} }
return p; return p;
} }
static bool IsWhiteSpace( char p ) { static bool IsWhiteSpace( char p ) {
return !IsUTF8Continuation(p) && isspace( static_cast<unsigned char>(p) ); return !IsUTF8Continuation(p) && std::isspace( static_cast<unsigned char>(p) );
} }
inline static bool StringEqual( const char* p, const char* q, int nChar=INT_MAX ) { inline static bool StringEqual( const char* p, const char* q, int nChar=INT_MAX ) {
@ -472,10 +472,10 @@ public:
return p & 0x80; return p & 0x80;
} }
inline static int IsAlphaNum( unsigned char anyByte ) { inline static int IsAlphaNum( unsigned char anyByte ) {
return ( anyByte < 128 ) ? isalnum( anyByte ) : 1; return ( anyByte < 128 ) ? std::isalnum( anyByte ) : 1;
} }
inline static int IsAlpha( unsigned char anyByte ) { inline static int IsAlpha( unsigned char anyByte ) {
return ( anyByte < 128 ) ? isalpha( anyByte ) : 1; return ( anyByte < 128 ) ? std::isalpha( anyByte ) : 1;
} }
static const char* ReadBOM( const char* p, bool* hasBOM ); static const char* ReadBOM( const char* p, bool* hasBOM );
@ -1374,7 +1374,7 @@ public:
Returns XML_NO_ERROR (0) on success, or Returns XML_NO_ERROR (0) on success, or
an errorID. an errorID.
*/ */
int LoadFile( FILE* ); int LoadFile( std::FILE* );
/** /**
Save the XML file to disk. Save the XML file to disk.
@ -1390,7 +1390,7 @@ public:
Returns XML_NO_ERROR (0) on success, or Returns XML_NO_ERROR (0) on success, or
an errorID. an errorID.
*/ */
int SaveFile( FILE* fp, bool compact = false ); int SaveFile( std::FILE* fp, bool compact = false );
bool ProcessEntities() const { bool ProcessEntities() const {
return _processEntities; return _processEntities;
@ -1789,7 +1789,7 @@ public:
If 'compact' is set to true, then output is created If 'compact' is set to true, then output is created
with only required whitespace and newlines. with only required whitespace and newlines.
*/ */
XMLPrinter( FILE* file=0, bool compact = false ); XMLPrinter( std::FILE* file=0, bool compact = false );
~XMLPrinter() {} ~XMLPrinter() {}
/** If streaming, write the BOM and declaration. */ /** If streaming, write the BOM and declaration. */
@ -1863,7 +1863,7 @@ private:
bool _elementJustOpened; bool _elementJustOpened;
bool _firstElement; bool _firstElement;
FILE* _fp; std::FILE* _fp;
int _depth; int _depth;
int _textDepth; int _textDepth;
bool _processEntities; bool _processEntities;