updated to monero master

5 years ago · 53bd774c8d
parent c62f719233
commit 53bd774c8d
3 changed files with 4 additions and 4 deletions
--- a/src/CurrentBlockchainStatus.cpp
+++ b/src/CurrentBlockchainStatus.cpp
@ -1341,7 +1341,7 @@ void
 MicroCoreAdapter::get_output_key(uint64_t amount,
                  vector<uint64_t> const& absolute_offsets,
                  vector<cryptonote::output_data_t>& outputs) 
-                   /*const */
+                   const 
 {
    cbs->get_output_keys(amount, absolute_offsets, outputs);
 }
--- a/src/CurrentBlockchainStatus.h
+++ b/src/CurrentBlockchainStatus.h
@ -388,7 +388,7 @@ public:
    get_output_key(uint64_t amount,
                   vector<uint64_t> const& absolute_offsets,
                   vector<cryptonote::output_data_t>& outputs) 
-                    /*const*/ override;
+                    const override;

    virtual void
    get_output_tx_and_index(
--- a/tests/mocks.h
+++ b/tests/mocks.h
@ -78,12 +78,12 @@ public:
                       bool(crypto::hash const& tx_hash,
                            transaction& tx));

-    MOCK_METHOD3(get_output_key,
+    MOCK_CONST_METHOD3(get_output_key,
                    void(uint64_t amount,
                         vector<uint64_t> const& absolute_offsets,
                         vector<output_data_t>& outputs));

-    MOCK_METHOD2(get_output_key,
+    MOCK_CONST_METHOD2(get_output_key,
                    output_data_t(uint64_t amount,
                                  uint64_t global_amount_index));