Changeset 52495 in vbox

Timestamp:

Aug 25, 2014 2:30:41 PM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

95721

Message:

Runtime: cdefs.h changes to avoid warnings from some g++ versions (related to allegedly invalid use of offsetof), and types.h changes fixing warnings related to RTUINT128_INIT / RTUINT128_INIT_C, the additional curlies are needed for the union

Location:

trunk/include/iprt

Files:

• cdefs.h (modified) (2 diffs)
• types.h (modified) (2 diffs)

trunk/include/iprt/cdefs.h

@@ -1540 +1540 @@
  * @param   member  Member.
  */
-#define RT_OFFSETOF(type, member)               ( (int)(uintptr_t)&( ((type *)(void *)0)->member) )
+#if defined(__GNUC__) && defined(__cplusplus)
+# define RT_OFFSETOF(type, member)              ( (int)(uintptr_t)&( ((type *)(void *)0x1000)->member) - 0x1000 )
+#else
+# define RT_OFFSETOF(type, member)              ( (int)(uintptr_t)&( ((type *)(void *)0)->member) )
+#endif
 
 /** @def RT_UOFFSETOF
@@ -1554 +1558 @@
  * @param   member  Member.
  */
-#define RT_UOFFSETOF(type, member)              ( (uintptr_t)&( ((type *)(void *)0)->member) )
+#if defined(__GNUC__) && defined(__cplusplus)
+# define RT_UOFFSETOF(type, member)             ( (uintptr_t)&( ((type *)(void *)0x1000)->member) - 0x1000 )
+#else
+# define RT_UOFFSETOF(type, member)             ( (uintptr_t)&( ((type *)(void *)0)->member) )
+#endif
 
 /** @def RT_OFFSETOF_ADD

trunk/include/iprt/types.h

@@ -488 +488 @@
  * Portable RTUINT128U initializer. */
 #ifdef RT_BIG_ENDIAN
-# define RTUINT128_INIT(a_Hi, a_Lo) { a_Hi, a_Lo }
-#else
-# define RTUINT128_INIT(a_Hi, a_Lo) { a_Lo, a_Hi }
+# define RTUINT128_INIT(a_Hi, a_Lo) { { a_Hi, a_Lo } }
+#else
+# define RTUINT128_INIT(a_Hi, a_Lo) { { a_Lo, a_Hi } }
 #endif
 
@@ -496 +496 @@
  * Portable RTUINT128U initializer for 64-bit constants. */
 #ifdef RT_BIG_ENDIAN
-# define RTUINT128_INIT_C(a_Hi, a_Lo) { UINT64_C(a_Hi), UINT64_C(a_Lo) }
-#else
-# define RTUINT128_INIT_C(a_Hi, a_Lo) { UINT64_C(a_Lo), UINT64_C(a_Hi) }
+# define RTUINT128_INIT_C(a_Hi, a_Lo) { { UINT64_C(a_Hi), UINT64_C(a_Lo) } }
+#else
+# define RTUINT128_INIT_C(a_Hi, a_Lo) { { UINT64_C(a_Lo), UINT64_C(a_Hi) } }
 #endif