From 5009d4c3b80e11b833fffc9f66c2f2833b36b46c Mon Sep 17 00:00:00 2001
From: JoelKatz <DavidJoelSchwartz@GMail.com>
Date: Sun, 30 Dec 2012 13:19:42 -0800
Subject: [PATCH] Cleanups.

---
 src/cpp/ripple/LedgerAcquire.h     | 2 +-
 src/cpp/ripple/LedgerConsensus.h   | 6 +++---
 src/cpp/ripple/SerializedTypes.h   | 6 ++++++
 src/cpp/ripple/TransactionEngine.h | 2 +-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/cpp/ripple/LedgerAcquire.h b/src/cpp/ripple/LedgerAcquire.h
index c677d6226..68cd27c48 100644
--- a/src/cpp/ripple/LedgerAcquire.h
+++ b/src/cpp/ripple/LedgerAcquire.h
@@ -91,7 +91,7 @@ public:
 	bool isAcctStComplete() const		{ return mHaveState; }
 	bool isTransComplete() const		{ return mHaveTransactions; }
 	bool isDone() const					{ return mAborted || isComplete() || isFailed(); } 
-	Ledger::pointer getLedger()			{ return mLedger; }
+	Ledger::ref getLedger()				{ return mLedger; }
 	void abort()						{ mAborted = true; }
 	bool setAccept()					{ if (mAccept) return false; mAccept = true; return true; }
 
diff --git a/src/cpp/ripple/LedgerConsensus.h b/src/cpp/ripple/LedgerConsensus.h
index f238368b0..240cc3229 100644
--- a/src/cpp/ripple/LedgerConsensus.h
+++ b/src/cpp/ripple/LedgerConsensus.h
@@ -43,7 +43,7 @@ public:
 	TransactionAcquire(const uint256& hash);
 	virtual ~TransactionAcquire()		{ ; }
 
-	SHAMap::pointer getMap()			{ return mMap; }
+	SHAMap::ref getMap()				{ return mMap; }
 
 	SMAddNode takeNodes(const std::list<SHAMapNode>& IDs,
 		const std::list< std::vector<unsigned char> >& data, Peer::ref);
@@ -161,8 +161,8 @@ public:
 	int startup();
 	Json::Value getJson();
 
-	Ledger::pointer peekPreviousLedger()	{ return mPreviousLedger; }
-	uint256 getLCL()						{ return mPrevLedgerHash; }
+	Ledger::ref peekPreviousLedger()	{ return mPreviousLedger; }
+	uint256 getLCL()					{ return mPrevLedgerHash; }
 
 	SHAMap::pointer getTransactionTree(const uint256& hash, bool doAcquire);
 	TransactionAcquire::pointer getAcquiring(const uint256& hash);
diff --git a/src/cpp/ripple/SerializedTypes.h b/src/cpp/ripple/SerializedTypes.h
index c29e4c69f..b6d202446 100644
--- a/src/cpp/ripple/SerializedTypes.h
+++ b/src/cpp/ripple/SerializedTypes.h
@@ -779,11 +779,17 @@ public:
 	virtual bool isDefault() const	{ return mValue.empty(); }
 
 	std::vector<uint256> getValue() const			{ return mValue; }
+	int size() const								{ return mValue.size(); }
 	bool isEmpty() const							{ return mValue.empty(); }
+
+	const uint256& at(int i) const					{ assert((i >= 0) && (i < size())); return mValue.at(i); }
+	uint256& at(int i)								{ assert((i >= 0) && (i < size())); return mValue.at(i); }
+
 	void setValue(const STVector256& v)				{ mValue = v.mValue; }
 	void setValue(const std::vector<uint256>& v)	{ mValue = v; }
 	void addValue(const uint256& v)					{ mValue.push_back(v); }
 
+
 	Json::Value getJson(int) const;
 };
 
diff --git a/src/cpp/ripple/TransactionEngine.h b/src/cpp/ripple/TransactionEngine.h
index 67a53447b..ab80191c8 100644
--- a/src/cpp/ripple/TransactionEngine.h
+++ b/src/cpp/ripple/TransactionEngine.h
@@ -70,7 +70,7 @@ public:
 	TransactionEngine(Ledger::ref ledger) : mLedger(ledger), mTxnSeq(0) { assert(mLedger); }
 
 	LedgerEntrySet& getNodes()			{ return mNodes; }
-	Ledger::pointer getLedger()			{ return mLedger; }
+	Ledger::ref getLedger()				{ return mLedger; }
 	void setLedger(Ledger::ref ledger)	{ assert(ledger); mLedger = ledger; }
 
 	SLE::pointer		entryCreate(LedgerEntryType type, const uint256& index)		{ return mNodes.entryCreate(type, index); }