From 6b3fd2d3cae85bd310f46f5929b110a579684c79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Bylica?= <chfast@gmail.com>
Date: Thu, 18 Jun 2015 14:01:43 +0200
Subject: [PATCH] Small override & std::move fixes.

---
 libethereum/BlockChain.cpp  | 2 +-
 libethereum/EthereumHost.h  | 6 +++---
 libweb3jsonrpc/JsonHelper.h | 2 +-
 mix/MixClient.h             | 1 +
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/libethereum/BlockChain.cpp b/libethereum/BlockChain.cpp
index 10256900d..92cc2733f 100644
--- a/libethereum/BlockChain.cpp
+++ b/libethereum/BlockChain.cpp
@@ -1122,6 +1122,6 @@ VerifiedBlockRef BlockChain::verifyBlock(bytes const& _block, function<void(Exce
 		++i;
 	}
 	res.block = bytesConstRef(&_block);
-	return move(res);
+	return res;
 }
 
diff --git a/libethereum/EthereumHost.h b/libethereum/EthereumHost.h
index 098d893ee..3519e3d0e 100644
--- a/libethereum/EthereumHost.h
+++ b/libethereum/EthereumHost.h
@@ -105,7 +105,7 @@ private:
 	bool needBlocks() const { return m_state == SyncState::Blocks || m_state == SyncState::NewBlocks; }
 
 	/// Sync with the BlockChain. It might contain one of our mined blocks, we might have new candidates from the network.
-	void doWork();
+	virtual void doWork() override;
 
 	void maintainTransactions();
 	void maintainBlocks(h256 const& _currentBlock);
@@ -121,8 +121,8 @@ private:
 	/// Initialises the network peer-state, doing the stuff that needs to be once-only. @returns true if it really was first.
 	bool ensureInitialised();
 
-	virtual void onStarting() { startWorking(); }
-	virtual void onStopping() { stopWorking(); }
+	virtual void onStarting() override { startWorking(); }
+	virtual void onStopping() override { stopWorking(); }
 
 	void continueSync(); /// Find something to do for all peers
 	void continueSync(EthereumPeer* _peer); /// Find some work to do for a peer
diff --git a/libweb3jsonrpc/JsonHelper.h b/libweb3jsonrpc/JsonHelper.h
index d445ad0dc..dd868f8de 100644
--- a/libweb3jsonrpc/JsonHelper.h
+++ b/libweb3jsonrpc/JsonHelper.h
@@ -43,7 +43,7 @@ namespace eth
 {
 
 class Transaction;
-class BlockDetails;
+struct BlockDetails;
 class Interface;
 using Transactions = std::vector<Transaction>;
 using UncleHashes = h256s;
diff --git a/mix/MixClient.h b/mix/MixClient.h
index afb9f5430..1172bffbd 100644
--- a/mix/MixClient.h
+++ b/mix/MixClient.h
@@ -59,6 +59,7 @@ public:
 	dev::eth::ExecutionResult call(Address const& _secret, u256 _value, Address _dest, bytes const& _data, u256 _gas, u256 _gasPrice, eth::BlockNumber _blockNumber = eth::PendingBlock, eth::FudgeFactor _ff = eth::FudgeFactor::Strict) override;
 	dev::eth::ExecutionResult create(Address const& _secret, u256 _value, bytes const& _data = bytes(), u256 _gas = 10000, u256 _gasPrice = 10 * eth::szabo, eth::BlockNumber _blockNumber = eth::PendingBlock, eth::FudgeFactor _ff = eth::FudgeFactor::Strict) override;
 
+	using ClientBase::submitTransaction;
 	void submitTransaction(Secret _secret, u256 _value, Address _dest, bytes const& _data, u256 _gas, u256 _gasPrice, bool _gasAuto);
 	Address submitTransaction(Secret _secret, u256 _endowment, bytes const& _init, u256 _gas, u256 _gasPrice, bool _gasAuto);
 	dev::eth::ExecutionResult call(Address const& _secret, u256 _value, Address _dest, bytes const& _data, u256 _gas, u256 _gasPrice, eth::BlockNumber _blockNumber, bool _gasAuto, eth::FudgeFactor _ff = eth::FudgeFactor::Strict);