Merge da8c7ed into merged_master (Bitcoin PR #21364)

apoelstra · apoelstra · commit 548b6fc4f923 · 2021-06-26T02:10:59.000Z
diff --git a/src/test/fuzz/util.h b/src/test/fuzz/util.h
@@ -10,6 +10,7 @@
 #include <attributes.h>
 #include <chainparamsbase.h>
 #include <coins.h>
+#include <compat.h>
 #include <consensus/consensus.h>
 #include <merkleblock.h>
 #include <net.h>
@@ -546,11 +547,13 @@ class FuzzedSock : public Sock
     SOCKET Get() const override
     {
         assert(false && "Not implemented yet.");
+        return INVALID_SOCKET;
     }
 
     SOCKET Release() override
     {
         assert(false && "Not implemented yet.");
+        return INVALID_SOCKET;
     }
 
     void Reset() override

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@`
`10`	`10`	`#include <attributes.h>`
`11`	`11`	`#include <chainparamsbase.h>`
`12`	`12`	`#include <coins.h>`
	`13`	`+#include <compat.h>`
`13`	`14`	`#include <consensus/consensus.h>`
`14`	`15`	`#include <merkleblock.h>`
`15`	`16`	`#include <net.h>`
`@@ -546,11 +547,13 @@ class FuzzedSock : public Sock`
`546`	`547`	`SOCKET Get() const override`
`547`	`548`	`{`
`548`	`549`	`assert(false && "Not implemented yet.");`
	`550`	`+ return INVALID_SOCKET;`
`549`	`551`	`}`
`550`	`552`
`551`	`553`	`SOCKET Release() override`
`552`	`554`	`{`
`553`	`555`	`assert(false && "Not implemented yet.");`
	`556`	`+ return INVALID_SOCKET;`
`554`	`557`	`}`
`555`	`558`
`556`	`559`	`void Reset() override`