From 8bef047313a3dc4baeed119db443721a3fa0e0fe Mon Sep 17 00:00:00 2001 From: Daniel Hams Date: Thu, 20 Feb 2014 13:27:54 +0000 Subject: [PATCH] Fix initialisation order bug with units() and replace std::pair with make_pair. --- alethzero/MainWin.cpp | 2 +- libethereum/AddressState.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/alethzero/MainWin.cpp b/alethzero/MainWin.cpp index 34561630b..947b78d35 100644 --- a/alethzero/MainWin.cpp +++ b/alethzero/MainWin.cpp @@ -52,9 +52,9 @@ Main::Main(QWidget *parent) : #endif on_verbosity_sliderMoved(); + initUnits(ui->valueUnits); on_destination_textChanged(); - initUnits(ui->valueUnits); statusBar()->addPermanentWidget(ui->balance); statusBar()->addPermanentWidget(ui->peerCount); statusBar()->addPermanentWidget(ui->blockCount); diff --git a/libethereum/AddressState.h b/libethereum/AddressState.h index 1f514d66a..9475f6959 100644 --- a/libethereum/AddressState.h +++ b/libethereum/AddressState.h @@ -47,7 +47,7 @@ public: { auto mFinder = m_memory.find((u256)i); if (mFinder == m_memory.end()) - m_memory.insert(std::pair((u256)i,_memory[i])); + m_memory.insert(std::make_pair((u256)i,_memory[i])); else mFinder->second = _memory[i]; }