Merge pull request #328 from isanych/master

Fix alignment of 64bit platforms

Merge pull request #328 from isanych/master
Fix alignment of 64bit platforms
286aa8a6 · Milo Yip · a72c35b9 · 1576cde5 · 286aa8a6
Commit 286aa8a6 authored May 06, 2015 by Milo Yip
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

rapidjson.h include/rapidjson/rapidjson.h +4 -0

No files found.
--- a/include/rapidjson/rapidjson.h
+++ b/include/rapidjson/rapidjson.h
@@ -241,8 +241,12 @@
    alignment. User can customize by defining the RAPIDJSON_ALIGN function macro.,
 */
 #ifndef RAPIDJSON_ALIGN
+#if RAPIDJSON_64BIT == 1
+#define RAPIDJSON_ALIGN(x) ((x + 7u) & ~7u)
+#else
 #define RAPIDJSON_ALIGN(x) ((x + 3u) & ~3u)
 #endif
+#endif

 ///////////////////////////////////////////////////////////////////////////////
 // RAPIDJSON_UINT64_C2