Merge branch 'dev' into FSM

# Conflicts: # src/komodo_globals.h
2019-07-12 16:40:49 -11:00
parent ad7aeaccb8 152c86ce84
commit 3d22bdf181
12 changed files with 153 additions and 15 deletions
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -147,7 +147,7 @@ namespace {

    struct CBlockIndexWorkComparator
    {
-        bool operator()(const CBlockIndex *pa, const CBlockIndex *pb) const {
+        bool operator()(CBlockIndex *pa, const CBlockIndex *pb) const {
            // First sort by most total work, ...
           
            if (ASSETCHAINS_LWMAPOS) {