DEF_VEC_ALLOC_FUNC_O(T) \
struct vec_swallow_trailing_semi
+/* Avoid offsetof (or its usual C implementation) as it triggers
+ -Winvalid-offsetof warnings with enum_flags types with G++ <= 4.4,
+ even though those types are memcpyable. This requires allocating a
+ dummy local VEC in all routines that use this, but that has the
+ advantage that it only works if T is default constructible, which
+ is exactly a check we want, to keep C compatibility. */
+#define vec_offset(T, VPTR) ((size_t) ((char *) &(VPTR)->vec - (char *) VPTR))
+
#define DEF_VEC_ALLOC_FUNC_I(T) \
static inline VEC(T) *VEC_OP (T,alloc) \
(int alloc_) \
{ \
+ VEC(T) dummy; \
+ \
/* We must request exact size allocation, hence the negation. */ \
return (VEC(T) *) vec_o_reserve (NULL, -alloc_, \
- offsetof (VEC(T),vec), sizeof (T)); \
+ vec_offset (T, &dummy), sizeof (T)); \
} \
\
static inline VEC(T) *VEC_OP (T,copy) (VEC(T) *vec_) \
\
if (len_) \
{ \
+ VEC(T) dummy; \
+ \
/* We must request exact size allocation, hence the negation. */ \
new_vec_ = (VEC (T) *) \
- vec_o_reserve (NULL, -len_, offsetof (VEC(T),vec), sizeof (T)); \
+ vec_o_reserve (NULL, -len_, vec_offset (T, &dummy), sizeof (T)); \
\
new_vec_->num = len_; \
memcpy (new_vec_->vec, vec_->vec, sizeof (T) * len_); \
{ \
if (vec1_ && vec2_) \
{ \
+ VEC(T) dummy; \
size_t len_ = vec1_->num + vec2_->num; \
VEC (T) *new_vec_ = NULL; \
\
/* We must request exact size allocation, hence the negation. */ \
new_vec_ = (VEC (T) *) \
- vec_o_reserve (NULL, -len_, offsetof (VEC(T),vec), sizeof (T)); \
+ vec_o_reserve (NULL, -len_, vec_offset (T, &dummy), sizeof (T)); \
\
new_vec_->num = len_; \
memcpy (new_vec_->vec, vec1_->vec, sizeof (T) * vec1_->num); \
static inline int VEC_OP (T,reserve) \
(VEC(T) **vec_, int alloc_ VEC_ASSERT_DECL) \
{ \
+ VEC(T) dummy; \
int extend = !VEC_OP (T,space) \
(*vec_, alloc_ < 0 ? -alloc_ : alloc_ VEC_ASSERT_PASS); \
\
if (extend) \
*vec_ = (VEC(T) *) vec_o_reserve (*vec_, alloc_, \
- offsetof (VEC(T),vec), sizeof (T)); \
+ vec_offset (T, &dummy), sizeof (T)); \
\
return extend; \
} \
static inline size_t VEC_OP (T,embedded_size) \
(int alloc_) \
{ \
- return offsetof (VEC(T),vec) + alloc_ * sizeof(T); \
+ VEC(T) dummy; \
+ \
+ return vec_offset (T, &dummy) + alloc_ * sizeof(T); \
} \
\
static inline void VEC_OP (T,embedded_init) \
static inline size_t VEC_OP (T,embedded_size) \
(int alloc_) \
{ \
- return offsetof (VEC(T),vec) + alloc_ * sizeof(T); \
+ VEC(T) dummy; \
+ \
+ return vec_offset (T, &dummy) + alloc_ * sizeof(T); \
} \
\
static inline void VEC_OP (T,embedded_init) \
static inline VEC(T) *VEC_OP (T,alloc) \
(int alloc_) \
{ \
+ VEC(T) dummy; \
+ \
/* We must request exact size allocation, hence the negation. */ \
return (VEC(T) *) vec_o_reserve (NULL, -alloc_, \
- offsetof (VEC(T),vec), sizeof (T)); \
+ vec_offset (T, &dummy), sizeof (T)); \
} \
\
static inline VEC(T) *VEC_OP (T,copy) (VEC(T) *vec_) \
\
if (len_) \
{ \
+ VEC(T) dummy; \
+ \
/* We must request exact size allocation, hence the negation. */ \
new_vec_ = (VEC (T) *) \
- vec_o_reserve (NULL, -len_, offsetof (VEC(T),vec), sizeof (T)); \
+ vec_o_reserve (NULL, -len_, vec_offset (T, &dummy), sizeof (T)); \
\
new_vec_->num = len_; \
memcpy (new_vec_->vec, vec_->vec, sizeof (T) * len_); \
{ \
if (vec1_ && vec2_) \
{ \
+ VEC(T) dummy; \
size_t len_ = vec1_->num + vec2_->num; \
VEC (T) *new_vec_ = NULL; \
\
/* We must request exact size allocation, hence the negation. */ \
new_vec_ = (VEC (T) *) \
- vec_o_reserve (NULL, -len_, offsetof (VEC(T),vec), sizeof (T)); \
+ vec_o_reserve (NULL, -len_, vec_offset (T, &dummy), sizeof (T)); \
\
new_vec_->num = len_; \
memcpy (new_vec_->vec, vec1_->vec, sizeof (T) * vec1_->num); \
static inline int VEC_OP (T,reserve) \
(VEC(T) **vec_, int alloc_ VEC_ASSERT_DECL) \
{ \
+ VEC(T) dummy; \
int extend = !VEC_OP (T,space) (*vec_, alloc_ < 0 ? -alloc_ : alloc_ \
VEC_ASSERT_PASS); \
\
if (extend) \
*vec_ = (VEC(T) *) \
- vec_o_reserve (*vec_, alloc_, offsetof (VEC(T),vec), sizeof (T)); \
+ vec_o_reserve (*vec_, alloc_, vec_offset (T, &dummy), sizeof (T)); \
\
return extend; \
} \