Merge branch 'master' of github.com:jedmccaleb/NewCoin

SConstruct

@@ -75,10 +75,21 @@ else:
 	    ]
     )
 
+# Apparently, only linux uses -ldl
+if not FreeBSD:
+    env.Append(
+	    LIBS = [
+		    'dl', # dynamic linking for linux
+	    ]
+    )
+
+# Apparently, pkg-config --libs protobuf on bsd fails to provide this necessary include dir.
+if FreeBSD:
+    env.Append(LINKFLAGS = ['-I/usr/local/include'])
+
 env.Append(
 	LIBS = [
 		'protobuf',
-		'dl', # dynamic linking
 		'z'
 	]
 )

src/cpp/ripple/AccountItems.h

@@ -4,9 +4,9 @@
 #include "Ledger.h"
 #include "SerializedLedger.h"
 
-/*
-Way to fetch ledger entries from an account's owner dir
-*/
+//
+// Fetch ledger entries from an account's owner dir.
+//
 class AccountItem
 {
 protected:
@@ -42,3 +42,5 @@ public:
 };
 
 #endif
+
+// vim:ts=4

src/cpp/ripple/Interpreter.h

@@ -50,7 +50,7 @@ public:
 
 	Interpreter();
 
-	// returns a TransactionEngineResult  
+	// returns a TransactionEngineResult
 	TER interpret(Contract* contract,const SerializedTransaction& txn,std::vector<unsigned char>& code);
 
 	void stop();
@@ -67,16 +67,13 @@ public:
 	bool startBlock(int offset);
 	bool endBlock();
 
-	
 	Data::pointer getIntData();
 	Data::pointer getFloatData();
 	Data::pointer getUint160Data();
 	Data::pointer getAcceptData(int index);
 	Data::pointer getContractData(int index);
-
-
 };
 
 }  // end namespace
 
-#endif
+#endif

src/cpp/ripple/Offer.cpp

@@ -13,4 +13,6 @@ Offer::Offer(SerializedLedgerEntry::pointer ledgerEntry) : AccountItem(ledgerEnt
 	mTakerGets		= mLedgerEntry->getFieldAmount(sfTakerGets);
 	mTakerPays		= mLedgerEntry->getFieldAmount(sfTakerPays);
 	mSeq = mLedgerEntry->getFieldU32(sfSequence);
-}
+}
+
+// vim:ts=4

src/cpp/ripple/Offer.h

@@ -1,6 +1,5 @@
 #include "AccountItems.h"
 
-
 class Offer : public AccountItem
 {
 	RippleAddress mAccount;
@@ -20,4 +19,6 @@ public:
 	RippleAddress getAccount(){ return(mAccount); }
 	int getSeq(){ return(mSeq); }
 
-};
+};
+
+// vim:ts=4

src/cpp/ripple/Operation.h

@@ -305,7 +305,7 @@ public:
 	bool work(Interpreter* interpreter)
 	{
 		Data::pointer index=interpreter->popStack();
-		if(index->isInt32()) 
+		if(index->isInt32())
 		{
 			interpreter->pushStack( interpreter->getContractData(index->getInt()));
 			return(true);
@@ -315,4 +315,6 @@ public:
 	}
 };
 
-}
+}
+
+// vim:ts=4

src/cpp/ripple/OrderBook.h

@@ -30,6 +30,6 @@ public:
 
 	// looks through the best offers to see how much it would cost to take the given amount
 	STAmount& getTakePrice(STAmount& takeAmount);
-	
+};
 
-};
+// vim:ts=4

src/cpp/ripple/OrderBookDB.h

@@ -27,4 +27,6 @@ public:
 	// returns the best rate we can find
 	float getPrice(uint160& currencyIn,uint160& currencyOut);
 
-};
+};
+
+// vim:ts=4

src/cpp/ripple/ScriptData.cpp

@@ -1 +1,3 @@
-#include "ScriptData.h"
+#include "ScriptData.h"
+
+// vim:ts=4

src/cpp/ripple/ScriptData.h

@@ -4,7 +4,7 @@
 #include <boost/shared_ptr.hpp>
 
 namespace Script {
-class Data  
+class Data
 {
 public:
 	typedef boost::shared_ptr<Data> pointer;
@@ -89,5 +89,6 @@ public:
 
 }
 
+#endif
 
-#endif
+// vim:ts=4