From 53bd774c8df7701299e073f94a9af71704b43b96 Mon Sep 17 00:00:00 2001
From: moneroexamples <moneroexamples@tuta.io>
Date: Sun, 17 Mar 2019 10:09:59 +0800
Subject: [PATCH] updated to monero master

---
 src/CurrentBlockchainStatus.cpp | 2 +-
 src/CurrentBlockchainStatus.h   | 2 +-
 tests/mocks.h                   | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/CurrentBlockchainStatus.cpp b/src/CurrentBlockchainStatus.cpp
index 0745325..4c3a63d 100755
--- 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);
 }
diff --git a/src/CurrentBlockchainStatus.h b/src/CurrentBlockchainStatus.h
index 93ddc3a..4517b68 100755
--- 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(
diff --git a/tests/mocks.h b/tests/mocks.h
index 50dbf6b..83b45d3 100755
--- 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));