summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorarseny.kapoulkine <arseny.kapoulkine@99668b35-9821-0410-8761-19e4c4f06640>2010-07-15 09:27:58 +0000
committerarseny.kapoulkine <arseny.kapoulkine@99668b35-9821-0410-8761-19e4c4f06640>2010-07-15 09:27:58 +0000
commitfc88f09ac1259a31f6da930ed9b885c0c83c38d1 (patch)
tree41354cd67ad9337cc8b43a6e7c58364e4f850b88 /src
parent3b3e2f7f26cc267fb1b91b798bfba0c7d1e5132d (diff)
Fixed alignment padding warning for Xbox 360
git-svn-id: http://pugixml.googlecode.com/svn/trunk@601 99668b35-9821-0410-8761-19e4c4f06640
Diffstat (limited to 'src')
-rw-r--r--src/pugixml.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/pugixml.cpp b/src/pugixml.cpp
index 5f21dc7..ca3f009 100644
--- a/src/pugixml.cpp
+++ b/src/pugixml.cpp
@@ -32,6 +32,7 @@
#ifdef _MSC_VER
# pragma warning(disable: 4127) // conditional expression is constant
# pragma warning(disable: 4611) // interaction between '_setjmp' and C++ object destruction is non-portable
+# pragma warning(disable: 4324) // structure was padded due to __declspec(align())
# pragma warning(disable: 4996) // this function or variable may be unsafe
#endif
@@ -1804,8 +1805,8 @@ namespace
struct xml_parser
{
xml_allocator alloc;
- jmp_buf error_handler;
char_t* error_offset;
+ jmp_buf error_handler;
// Parser utilities.
#define SKIPWS() { while (IS_CHARTYPE(*s, ct_space)) ++s; }