commit 35d9b333f876edaec547fac0e364bf01585ef3e5
author Carmelo Cascone <carmelo@opennetworking.org> Fri Jun 15 16:27:22 2018 +0200
committer Carmelo Cascone <carmelo@opennetworking.org> Fri Jun 15 19:05:11 2018 +0000
tree 8c47cbbafdac0ace9993717d6d2dfbf37dfaa0f7
parent 6af4e17c53a8220127b91c637c8ad08ce51a8bdb

Support compiling fabric.p4 with non-standard bool declarations

Change-Id: I5e579f58f274996fdff55d8e35d1dd96a7013941

pipelines/fabric/src/main/resources/include/header.p4

diff --git a/pipelines/fabric/src/main/resources/include/header.p4 b/pipelines/fabric/src/main/resources/include/header.p4
index 067d9c8..1c8dcfd 100644
--- a/pipelines/fabric/src/main/resources/include/header.p4
+++ b/pipelines/fabric/src/main/resources/include/header.p4
@@ -25,7 +25,7 @@
     bit<7> _pad;
 }
 
-_PKT_OUT_HDR_ANNOT_
+_PKT_OUT_HDR_ANNOT
 @controller_header("packet_out")
 header packet_out_header_t {
     port_num_t egress_port;
@@ -131,7 +131,7 @@
 }
 
 struct spgw_meta_t {
-    bool              do_spgw;
+    _BOOL             do_spgw;
     direction_t       direction;
     bit<16>           ipv4_len;
     bit<32>           teid;
@@ -151,7 +151,7 @@
 struct fabric_metadata_t {
     fwd_type_t fwd_type;
     next_id_t next_id;
-    bool pop_vlan_when_packet_in;
+    _BOOL pop_vlan_when_packet_in;
     bit<8> ip_proto;
     bit<16> l4_src_port;
     bit<16> l4_dst_port;