Fix build issues on gcc-10 (#999)

alexrallen · web-flow · commit af5c1563b44a · 2022-02-22T13:09:40.000+01:00
diff --git a/saiasiccmp/SaiSwitchAsic.h b/saiasiccmp/SaiSwitchAsic.h
@@ -3,6 +3,7 @@
 #include "syncd/SaiSwitchInterface.h"
 
 #include <map>
+#include <string>
 
 namespace saiasiccmp
 {
diff --git a/unittest/vslib/TestTrafficForwarder.cpp b/unittest/vslib/TestTrafficForwarder.cpp
@@ -44,7 +44,7 @@ TEST(TrafficForwarder, addVlanTag)
 
     EXPECT_FALSE(TrafficForwarder::addVlanTag(buffer, length, hdr));
 
-    struct tpacket_auxdata* aux = (struct tpacket_auxdata*)CMSG_DATA(cmsg);
+    struct tpacket_auxdata* aux = (struct tpacket_auxdata*)(void*)CMSG_DATA(cmsg);
 
     // https://en.wikipedia.org/wiki/IEEE_802.1Q
     //

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`#include "syncd/SaiSwitchInterface.h"`
`4`	`4`
`5`	`5`	`#include <map>`
	`6`	`+#include <string>`
`6`	`7`
`7`	`8`	`namespace saiasiccmp`
`8`	`9`	`{`