mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-09-01 06:45:17 +00:00
Code Issues Releases Wiki Activity

ofp-actions: Add compare to offsetof need for MSVC 2015/17

Browse Source 
Unfortunately starting from VS 2015, the "C" definition for `offsetof`
has been changed. Please see:
https://stackoverflow.com/questions/42725929/using-offsetof-with-enum-does-not-compile-in-visual-studio-2015/42726424

Several people reported the bug for 2015 and also 2017 (i.e. :
https://developercommunity.visualstudio.com/content/problem/22196/static-assert-cannot-compile-constexprs-method-tha.html
), but we don't have a fix yet.

This patch adds an explicit compare, although we could redefine the macro
for the same effect.

Signed-off-by: Alin Gabriel Serdean <aserdean@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>
Acked-by: Anand Kumar <kumaranand@vmware.com>
This commit is contained in:
Alin Gabriel Serdean
2017-11-01 19:19:07 +02:00
parent 2b3f8b6e23
commit 27f141d44d
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/openvswitch/ofp-actions.h
View File

@@ -1128,7 +1128,7 @@ void *ofpact_finish(struct ofpbuf *, struct ofpact *);
BUILD_ASSERT_DECL(offsetof(struct STRUCT, ofpact) == 0); \ BUILD_ASSERT_DECL(offsetof(struct STRUCT, ofpact) == 0); \
\ \
enum { OFPACT_##ENUM##_SIZE \ enum { OFPACT_##ENUM##_SIZE \
= (offsetof(struct STRUCT, MEMBER) \ = (offsetof(struct STRUCT, MEMBER) != 0 \
? offsetof(struct STRUCT, MEMBER) \ ? offsetof(struct STRUCT, MEMBER) \
: OFPACT_ALIGN(sizeof(struct STRUCT))) }; \ : OFPACT_ALIGN(sizeof(struct STRUCT))) }; \
\ \