Merge branch 'master' of https://github.com/stellar/stellard

stellar-deprecated · May 20, 2014 · aef9589 · aef9589
2 parents 6b8388c + 82764f0
commit aef9589
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/node_modules/stellar-lib b/node_modules/stellar-lib
diff --git a/src/ripple_app/transactors/AccountDeleteTransactor.cpp b/src/ripple_app/transactors/AccountDeleteTransactor.cpp
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 /*
-    This file is part of rippled: https://github.com/ripple/rippled
-    Copyright (c) 2012, 2013 Ripple Labs Inc.
+    This file is part of stellard: https://github.com/stellar/stellard
+    Copyright (c) 2014 Stellar Development Foundation Inc.
 
     Permission to use, copy, modify, and/or distribute this software for any
     purpose  with  or without fee is hereby granted, provided that the above
@@ -26,21 +26,21 @@ static void offerAdder(std::list<const uint256>& offersList, SLE::ref offer)
 {
 	if (offer->getType() == ltOFFER)
 	{
-		offersList.push_front(offer->getIndex());
+		//offersList.push_front(offer->getIndex());
 	}
 }
 
 static void rippleStateAdder(std::list<const uint256>& stateList, SLE::ref rippleState)
 {
 	if (rippleState->getType() == ltRIPPLE_STATE)
 	{
-		stateList.push_front(rippleState->getIndex());
+		//stateList.push_front(rippleState->getIndex());
 	}
 }
 
 TER AccountDeleteTransactor::doApply ()
 {
-
+	/*
     WriteLog (lsINFO, AccountDeleteTransactor) << "AccountDelete>";
 
 
@@ -214,7 +214,7 @@ TER AccountDeleteTransactor::doApply ()
 	// Delete account itself
 
 	mEngine->getNodes().entryDelete(mTxnAccount);
-
+	*/
 
     return tesSUCCESS;
 }

diff --git a/src/ripple_app/transactors/InflationTransactor.cpp b/src/ripple_app/transactors/InflationTransactor.cpp
@@ -23,7 +23,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #define INFLATION_NUM_WINNERS		5
 #define INFLATION_WIN_MIN_PERCENT	.1
 #define INFLATION_START_TIME		(1397088000-946684800) // seconds since 1/1/2000
+#ifndef MIN
 #define MIN(x,y)  ((x)<(y) ? (x) : (y))
+#endif
+
 /*
 What about when an account that wins a dole is now gone?
 */