Changeset 3028 for box

Timestamp:

23/10/2011 16:51:52 (7 months ago)

Author:

chris

Message:

Adjust for platforms where sizeof(long) < sizeof(void *), apparently
including Visual Studio 64-bit where sizeof(long) == 4. I don't fully
understand the code, so I hope this adjustment is correct!

File:

• box/trunk/lib/backupstore/BackupStoreFile.h (modified) (2 diffs)

box/trunk/lib/backupstore/BackupStoreFile.h

@@ -163 +163 @@
                 if(a == 0) return 0;
                 // Align to main block size
-                ASSERT(sizeof(unsigned long) >= sizeof(void*)); // make sure casting the right pointer size
+                ASSERT(sizeof(uint64_t) >= sizeof(void*));      // make sure casting the right pointer size
                 uint8_t adjustment = BACKUPSTOREFILE_CODING_BLOCKSIZE
-                                                          - (uint8_t)(((unsigned long)a) % BACKUPSTOREFILE_CODING_BLOCKSIZE);
+                          - (uint8_t)(((uint64_t)a) % BACKUPSTOREFILE_CODING_BLOCKSIZE);
                 uint8_t *b = (a + adjustment);
                 // Store adjustment
@@ -175 +175 @@
         {
                 // Check alignment is as expected
-                ASSERT(sizeof(unsigned long) >= sizeof(void*)); // make sure casting the right pointer size
-                ASSERT((uint8_t)(((unsigned long)Block) % BACKUPSTOREFILE_CODING_BLOCKSIZE) == BACKUPSTOREFILE_CODING_OFFSET);
+                ASSERT(sizeof(uint64_t) >= sizeof(void*));      // make sure casting the right pointer size
+                ASSERT((uint8_t)(((uint64_t)Block) % BACKUPSTOREFILE_CODING_BLOCKSIZE) == BACKUPSTOREFILE_CODING_OFFSET);
                 uint8_t *a = (uint8_t*)Block;
                 a -= BACKUPSTOREFILE_CODING_OFFSET;