diff options
| author | Arseny Kapoulkine <arseny.kapoulkine@gmail.com> | 2014-10-11 01:35:24 -0700 |
|---|---|---|
| committer | Arseny Kapoulkine <arseny.kapoulkine@gmail.com> | 2014-10-11 01:35:24 -0700 |
| commit | fcd1876a21593bd62580383874b57c734d629a0c (patch) | |
| tree | 71e32758854b21d29914eea7f6dfdc45e8e7d33d /src | |
| parent | 52371bf5fea2ddd316857c5005dd384d7edf78ec (diff) | |
Fix compact mode for 64-bit architectures
Diffstat (limited to 'src')
| -rw-r--r-- | src/pugixml.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/pugixml.cpp b/src/pugixml.cpp index f496b37..ccc8276 100644 --- a/src/pugixml.cpp +++ b/src/pugixml.cpp @@ -656,8 +656,8 @@ PUGI__NS_END #ifdef PUGIXML_COMPACT PUGI__NS_BEGIN - static const unsigned int compact_alignment_log2 = 2; - static const unsigned int compact_alignment = 1 << compact_alignment_log2; + static const uintptr_t compact_alignment_log2 = 2; + static const uintptr_t compact_alignment = 1 << compact_alignment_log2; class compact_header { @@ -672,12 +672,12 @@ PUGI__NS_BEGIN this->flags = static_cast<unsigned char>(flags); } - void operator&=(unsigned int modflags) + void operator&=(uintptr_t modflags) { flags &= modflags; } - void operator|=(unsigned int modflags) + void operator|=(uintptr_t modflags) { flags |= modflags; } @@ -826,7 +826,7 @@ PUGI__NS_BEGIN operator T* const() const { - unsigned int data = _data0 + (_data1 << 8); + int data = _data0 + (_data1 << 8); if (data) { |