Major updates integration from all upstreams

2018-09-18 14:33:53 -07:00
parent 0c8fa56a02 0e0f5e4ea7
commit 9feb4b9e08
396 changed files with 25517 additions and 6854 deletions
--- a/src/cc/betprotocol.h
+++ b/src/cc/betprotocol.h
@@ -29,7 +29,7 @@ public:
    uint256 notarisationHash;
    ADD_SERIALIZE_METHODS;
    template <typename Stream, typename Operation>
-    inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
+    inline void SerializationOp(Stream& s, Operation ser_action) {
        READWRITE(branch);
        READWRITE(notarisationHash);
    }