AxioDL
/
tinyxml2
mirror of https://github.com/AxioDL/tinyxml2.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #80 from kainjow/master 

Fix MSXML conflict
This commit is contained in:
Lee Thomason 2012-11-12 12:59:18 -08:00
parent 687f90e843 04c22d250a
commit 248e523dad
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tinyxml2.cpp
View File

@ -30,7 +30,6 @@ distribution.
# include <cstddef> # include <cstddef>
#endif #endif
using namespace tinyxml2;
using namespace std; 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
@ -64,6 +63,9 @@ static const unsigned char TIXML_UTF_LEAD_2 = 0xbfU;
} \ } \
} }
namespace tinyxml2
{
struct Entity { struct Entity {
const char* pattern; const char* pattern;
int length; int length;
@ -2084,3 +2086,5 @@ bool XMLPrinter::Visit( const XMLUnknown& unknown )
PushUnknown( unknown.Value() ); PushUnknown( unknown.Value() );
return true; return true;
} }
}