Auto merge of #2820 - str4d:darwin-build-patches, r=str4d

[macOS] Darwin build patches Part of #2246.
2018-04-03 12:44:24 -07:00
parent 3055fd5508 b96f7d692d
commit 599c847818
18 changed files with 187 additions and 160 deletions
--- a/src/consensus/upgrades.cpp
+++ b/src/consensus/upgrades.cpp
@@ -69,6 +69,8 @@ int CurrentEpoch(int nHeight, const Consensus::Params& params) {
            return idxInt;
        }
    }
+    // Base case
+    return Consensus::BASE_SPROUT;
 }

 uint32_t CurrentEpochBranchId(int nHeight, const Consensus::Params& params) {