Rebase patch

Author: jeffro256

src/blockchain_db/lmdb/db_lmdb.h

@@ -279,7 +279,7 @@ class BlockchainLMDB final: public BlockchainDB
   bool get_prunable_tx_blob(const crypto::hash& h, cryptonote::blobdata &tx) const override;
   bool get_prunable_tx_hash(const crypto::hash& tx_hash, crypto::hash &prunable_hash) const override;
 
-  std::vector<outkey> get_tx_output_data(const crypto::hash& h, cryptonote::transaction &tx) const;
+  std::vector<outkey> get_tx_output_data(const crypto::hash& h, cryptonote::transaction &tx) const override;
 
   std::vector<crypto::hash> get_txids_loose(const crypto::hash& h, std::uint32_t bits, uint64_t max_num_txs = 0) override;
 
@@ -442,7 +442,7 @@ class BlockchainLMDB final: public BlockchainDB
 
   void remove_spent_key(const crypto::key_image& k_image) override;
 
-  uint64_t num_outputs() const;
+  uint64_t num_outputs() const override;
 
   virtual void add_locked_outs(const fcmp_pp::curve_trees::OutsByLastLockedBlock& outs_by_last_locked_block, const std::unordered_map<uint64_t/*output_id*/, uint64_t/*last locked block_id*/>& timelocked_outputs);
 

src/cryptonote_basic/cryptonote_basic.h

@@ -511,18 +511,18 @@ namespace cryptonote
       hash_valid(b.is_hash_valid()),
       miner_tx(b.miner_tx),
       tx_hashes(b.tx_hashes),
-      hash(b.hash),
       fcmp_pp_n_tree_layers(b.fcmp_pp_n_tree_layers),
-      fcmp_pp_tree_root(b.fcmp_pp_tree_root)
+      fcmp_pp_tree_root(b.fcmp_pp_tree_root),
+      hash(b.hash)
     {}
     block(block &&b):
       block_header(std::move(b)),
       hash_valid(b.is_hash_valid()),
       miner_tx(std::move(b.miner_tx)),
       tx_hashes(std::move(b.tx_hashes)),
-      hash(std::move(b.hash)),
-      fcmp_pp_n_tree_layers(b.fcmp_pp_n_tree_layers),
-      fcmp_pp_tree_root(std::move(b.fcmp_pp_tree_root))
+      fcmp_pp_n_tree_layers(std::move(b.fcmp_pp_n_tree_layers)),
+      fcmp_pp_tree_root(std::move(b.fcmp_pp_tree_root)),
+      hash(std::move(b.hash))
     {
       b.miner_tx.set_null();
       b.tx_hashes.clear();
@@ -535,9 +535,9 @@ namespace cryptonote
         hash_valid = b.is_hash_valid();
         miner_tx = b.miner_tx;
         tx_hashes = b.tx_hashes;
-        hash = b.hash;
         fcmp_pp_n_tree_layers = b.fcmp_pp_n_tree_layers;
         fcmp_pp_tree_root = b.fcmp_pp_tree_root;
+        hash = b.hash;
       }
       return *this;
     }
@@ -549,9 +549,9 @@ namespace cryptonote
         hash_valid = b.is_hash_valid();
         miner_tx = std::move(b.miner_tx);
         tx_hashes = std::move(b.tx_hashes);
-        hash = std::move(b.hash);
         fcmp_pp_n_tree_layers = b.fcmp_pp_n_tree_layers;
-        fcmp_pp_tree_root = std::move(b.fcmp_pp_tree_root);
+        fcmp_pp_tree_root = b.fcmp_pp_tree_root;
+        hash = std::move(b.hash);
         b.miner_tx.set_null();
         b.tx_hashes.clear();
       }

src/serialization/variant.h

@@ -178,7 +178,7 @@ template <
   >
 static bool do_serialize(Archive<true> &ar, boost::variant<T...> &v)
 {
-  return boost::apply_visitor(variant_write_visitor<Archive>(ar), v); 
+  return boost::apply_visitor(variant_write_visitor<Archive>(ar), v);
 }
 
 template <