Merge pull request #69 from danielhams/dhdevelop

Init order bug fix to units and code standardisation fix

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);

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,u256>((u256)i,_memory[i]));
+				m_memory.insert(std::make_pair((u256)i,_memory[i]));
 			else
 				mFinder->second = _memory[i];
 		}