From 56a780e5c3c65253b4367d769ca9cda8fa2dbc8b Mon Sep 17 00:00:00 2001
From: JoelKatz <DavidJoelSchwartz@GMail.com>
Date: Tue, 22 May 2012 07:56:38 -0700
Subject: [PATCH] Cleanups.

---
 src/Conversion.cpp    |  2 +-
 src/LedgerAcquire.cpp | 12 ++++++------
 src/LedgerConsensus.h |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Conversion.cpp b/src/Conversion.cpp
index f1588f188c..a0ac3c1e91 100644
--- a/src/Conversion.cpp
+++ b/src/Conversion.cpp
@@ -23,7 +23,7 @@ uint160 humanTo160(const std::string& buf)
 	vector<unsigned char> retVec;
 	DecodeBase58(buf,retVec);
 	uint160 ret;
-	memcpy(reinterpret_cast<unsigned char*>(&ret), &retVec[0], ret.GetSerializeSize());
+	memcpy(ret.begin(), &retVec[0], ret.GetSerializeSize());
 
 
 	return(ret);
diff --git a/src/LedgerAcquire.cpp b/src/LedgerAcquire.cpp
index 5bf98283f7..3228bbe488 100644
--- a/src/LedgerAcquire.cpp
+++ b/src/LedgerAcquire.cpp
@@ -250,7 +250,7 @@ void PeerSet::sendRequest(boost::shared_ptr<newcoin::TMGetLedger> tmGL)
 
 	PackedMessage::pointer packet = boost::make_shared<PackedMessage>(tmGL, newcoin::mtGET_LEDGER);
 
-	std::vector<boost::weak_ptr<Peer> >::iterator it = mPeers.begin();
+	std::vector< boost::weak_ptr<Peer> >::iterator it = mPeers.begin();
 	while (it != mPeers.end())
 	{
 		if (it->expired())
@@ -291,11 +291,11 @@ bool LedgerAcquire::takeBase(const std::string& data, Peer::pointer peer)
 }
 
 bool LedgerAcquire::takeTxNode(const std::list<SHAMapNode>& nodeIDs,
-	const std::list<std::vector<unsigned char> >& data, Peer::pointer peer)
+	const std::list< std::vector<unsigned char> >& data, Peer::pointer peer)
 {
 	if (!mHaveBase) return false;
 	std::list<SHAMapNode>::const_iterator nodeIDit = nodeIDs.begin();
-	std::list<std::vector<unsigned char> >::const_iterator nodeDatait = data.begin();
+	std::list< std::vector<unsigned char> >::const_iterator nodeDatait = data.begin();
 	while (nodeIDit != nodeIDs.end())
 	{
 		if (nodeIDit->isRoot())
@@ -318,7 +318,7 @@ bool LedgerAcquire::takeTxNode(const std::list<SHAMapNode>& nodeIDs,
 }
 
 bool LedgerAcquire::takeAsNode(const std::list<SHAMapNode>& nodeIDs,
-	const std::list<std::vector<unsigned char> >& data, Peer::pointer peer)
+	const std::list< std::vector<unsigned char> >& data, Peer::pointer peer)
 {
 #ifdef DEBUG
 	std::cerr << "got ASdata acquiring ledger " << mHash.GetHex() << std::endl;
@@ -391,7 +391,7 @@ bool LedgerAcquireMaster::gotLedgerData(newcoin::TMLedgerData& packet, Peer::poi
 #endif
 		return false;
 	}
-	memcpy(&hash, packet.ledgerhash().data(), 32);
+	memcpy(hash.begin(), packet.ledgerhash().data(), 32);
 #ifdef DEBUG
 	std::cerr << hash.GetHex() << std::endl;
 #endif
@@ -409,7 +409,7 @@ bool LedgerAcquireMaster::gotLedgerData(newcoin::TMLedgerData& packet, Peer::poi
 	else if ((packet.type() == newcoin::liTX_NODE) || (packet.type() == newcoin::liAS_NODE))
 	{
 		std::list<SHAMapNode> nodeIDs;
-		std::list<std::vector<unsigned char> > nodeData;
+		std::list< std::vector<unsigned char> > nodeData;
 
 		if (packet.nodes().size() <= 0) return false;
 		for (int i = 0; i < packet.nodes().size(); ++i)
diff --git a/src/LedgerConsensus.h b/src/LedgerConsensus.h
index f2ef4110ef..67ef0cd921 100644
--- a/src/LedgerConsensus.h
+++ b/src/LedgerConsensus.h
@@ -34,7 +34,7 @@ public:
 
 	SHAMap::pointer getMap()			{ return mMap; }
 
-	bool takeNode(const std::list<SHAMapNode>& IDs, const std::list<std::vector<unsigned char> >& data,
+	bool takeNode(const std::list<SHAMapNode>& IDs, const std::list< std::vector<unsigned char> >& data,
 		Peer::pointer);
 };