]> git.proxmox.com Git - mirror_ovs.git/commit
packets: Fix C++ compilation issues when include packets.h
authorYi-Hung Wei <yihung.wei@gmail.com>
Wed, 1 Nov 2017 21:40:27 +0000 (14:40 -0700)
committerBen Pfaff <blp@ovn.org>
Thu, 2 Nov 2017 18:23:38 +0000 (11:23 -0700)
commit274cd1f188de5d751ed014169dae54ed64e5c916
treea1312a85d1bff6fde5e27635e241fdb19eff05f4
parent36e6714054534b552413ba3b8e7eab49f965dc29
packets: Fix C++ compilation issues when include packets.h

This patch fixes three C++ compilation errors when it includes
"lib/packets.h".

1) Fix in "include/openvswitch/util.h" is to avoid duplicated
named_member__ in struct pkt_metadata.

2) Fix in "lib/packets.h" is because designated initializers are not
implemented in GNU C++ [1].

3) Fix in "lib/util.h" is because __builtin_types_compatible_p and
__builtin_choose_expr are only supported in GCC. I use one solution
for C++ that is type-safe and works at compile time from [2].

[1]: https://gcc.gnu.org/onlinedocs/gcc/Designated-Inits.html
[2]: https://goo.gl/xNe48A

Signed-off-by: Yi-Hung Wei <yihung.wei@gmail.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
include/openvswitch/util.h
lib/packets.h
lib/util.h