From 42be423a4eaf30f44fe7fc88e51fd9705343c568 Mon Sep 17 00:00:00 2001
From: moneroexamples <moneroexamples@tuta.io>
Date: Wed, 27 Feb 2019 16:56:27 +0800
Subject: [PATCH] updated to monero release-v013 branch

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

diff --git a/src/CurrentBlockchainStatus.cpp b/src/CurrentBlockchainStatus.cpp
index f9fb867..511744c 100755
--- a/src/CurrentBlockchainStatus.cpp
+++ b/src/CurrentBlockchainStatus.cpp
@@ -1249,7 +1249,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 ebec8de..170c25e 100755
--- a/src/CurrentBlockchainStatus.h
+++ b/src/CurrentBlockchainStatus.h
@@ -375,7 +375,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/src/xmregcore b/src/xmregcore
index 9b05088..1290af5 160000
--- a/src/xmregcore
+++ b/src/xmregcore
@@ -1 +1 @@
-Subproject commit 9b050883c60f79a8465a2a711993c61531b2cfe8
+Subproject commit 1290af5d8b8cd71bc221bf908ee9feb8d2b4d2c4
diff --git a/tests/mocks.h b/tests/mocks.h
index 83b45d3..50dbf6b 100755
--- a/tests/mocks.h
+++ b/tests/mocks.h
@@ -78,12 +78,12 @@ public:
                        bool(crypto::hash const& tx_hash,
                             transaction& tx));
 
-    MOCK_CONST_METHOD3(get_output_key,
+    MOCK_METHOD3(get_output_key,
                     void(uint64_t amount,
                          vector<uint64_t> const& absolute_offsets,
                          vector<output_data_t>& outputs));
 
-    MOCK_CONST_METHOD2(get_output_key,
+    MOCK_METHOD2(get_output_key,
                     output_data_t(uint64_t amount,
                                   uint64_t global_amount_index));