[MLton-commit] r4727

[Matthew F. <fl...@ml...>]

Tweaked compile time asserts
----------------------------------------------------------------------

U   mlton/branches/on-20050822-x86_64-branch/runtime/gc/int-inf.h
U   mlton/branches/on-20050822-x86_64-branch/runtime/gc/string.h

----------------------------------------------------------------------

Modified: mlton/branches/on-20050822-x86_64-branch/runtime/gc/int-inf.h
===================================================================
--- mlton/branches/on-20050822-x86_64-branch/runtime/gc/int-inf.h	2006-10-18 21:25:13 UTC (rev 4726)
+++ mlton/branches/on-20050822-x86_64-branch/runtime/gc/int-inf.h	2006-10-18 22:00:11 UTC (rev 4727)
@@ -24,11 +24,11 @@
   } obj;
 } *GC_intInf;
 
-COMPILE_TIME_ASSERT(GC_intInf__fields_packed,
-                    offsetof(struct GC_intInf, obj) == sizeof(GC_arrayCounter) + sizeof(GC_arrayLength) + sizeof(GC_header));
-COMPILE_TIME_ASSERT(GC_intInf__isneg_packed,
+COMPILE_TIME_ASSERT(GC_intInf__obj_packed,
+                    offsetof(struct GC_intInf, obj) == offsetof(struct GC_intInf, counter) + sizeof(GC_arrayCounter) + sizeof(GC_arrayLength) + sizeof(GC_header));
+COMPILE_TIME_ASSERT(GC_intInf__obj_body_isneg_packed,
                     offsetof(struct GC_intInf, obj.body.isneg) == offsetof(struct GC_intInf, obj));
-COMPILE_TIME_ASSERT(GC_intInf__limbs_packed,
+COMPILE_TIME_ASSERT(GC_intInf_obj_body_limbs_packed,
                     offsetof(struct GC_intInf, obj.body.limbs) == offsetof(struct GC_intInf, obj) + sizeof(mp_limb_t));
 
 #endif /* (defined (MLTON_GC_INTERNAL_TYPES)) */

Modified: mlton/branches/on-20050822-x86_64-branch/runtime/gc/string.h
===================================================================
--- mlton/branches/on-20050822-x86_64-branch/runtime/gc/string.h	2006-10-18 21:25:13 UTC (rev 4726)
+++ mlton/branches/on-20050822-x86_64-branch/runtime/gc/string.h	2006-10-18 22:00:11 UTC (rev 4727)
@@ -23,9 +23,9 @@
   } obj;
 } *GC_string8;
 
-COMPILE_TIME_ASSERT(GC_string8__fields_packed,
-                    offsetof(struct GC_string8, obj) == sizeof(GC_arrayCounter) + sizeof(GC_arrayLength) + sizeof(GC_header));
-COMPILE_TIME_ASSERT(GC_string8__chars_packed,
+COMPILE_TIME_ASSERT(GC_string8__obj_packed,
+                    offsetof(struct GC_string8, obj) == offsetof(struct GC_string8, counter) + sizeof(GC_arrayCounter) + sizeof(GC_arrayLength) + sizeof(GC_header));
+COMPILE_TIME_ASSERT(GC_string8__obj_body_chars_packed,
                     offsetof(struct GC_string8, obj.body.chars) == offsetof(struct GC_string8, obj));
 
 #endif /* (defined (MLTON_GC_INTERNAL_TYPES)) */