Don't use a shared_ptr where an auto_ptr will do.

This commit is contained in:
JoelKatz
2012-12-26 13:54:51 -08:00
parent 79d139e2ce
commit fa109a1aee
3 changed files with 12 additions and 12 deletions

View File

@@ -93,8 +93,8 @@ TER TransactionEngine::applyTransaction(const SerializedTransaction& txn, Transa
}
#endif
Transactor::pointer transactor=Transactor::makeTransactor(txn,params,this);
if(transactor)
std::auto_ptr<Transactor> transactor = Transactor::makeTransactor(txn,params,this);
if (transactor.get() != NULL)
{
uint256 txID = txn.getTransactionID();
if (!txID)

View File

@@ -11,26 +11,26 @@
SETUP_LOG();
Transactor::pointer Transactor::makeTransactor(const SerializedTransaction& txn,TransactionEngineParams params, TransactionEngine* engine)
std::auto_ptr<Transactor> Transactor::makeTransactor(const SerializedTransaction& txn,TransactionEngineParams params, TransactionEngine* engine)
{
switch(txn.getTxnType())
{
case ttPAYMENT:
return( Transactor::pointer(new PaymentTransactor(txn,params,engine)) );
return std::auto_ptr<Transactor>(new PaymentTransactor(txn, params, engine));
case ttACCOUNT_SET:
return( Transactor::pointer(new AccountSetTransactor(txn,params,engine)) );
return std::auto_ptr<Transactor>(new AccountSetTransactor(txn, params, engine));
case ttREGULAR_KEY_SET:
return( Transactor::pointer(new RegularKeySetTransactor(txn,params,engine)) );
return std::auto_ptr<Transactor>(new RegularKeySetTransactor(txn, params, engine));
case ttTRUST_SET:
return( Transactor::pointer(new TrustSetTransactor(txn,params,engine)) );
return std::auto_ptr<Transactor>(new TrustSetTransactor(txn, params, engine));
case ttOFFER_CREATE:
return( Transactor::pointer(new OfferCreateTransactor(txn,params,engine)) );
return std::auto_ptr<Transactor>(new OfferCreateTransactor(txn, params, engine));
case ttOFFER_CANCEL:
return( Transactor::pointer(new OfferCancelTransactor(txn,params,engine)) );
return std::auto_ptr<Transactor>(new OfferCancelTransactor(txn, params, engine));
case ttWALLET_ADD:
return( Transactor::pointer(new WalletAddTransactor(txn,params,engine)) );
return std::auto_ptr<Transactor>(new WalletAddTransactor(txn, params, engine));
default:
return(Transactor::pointer());
return std::auto_ptr<Transactor>();
}
}

View File

@@ -33,7 +33,7 @@ protected:
public:
typedef boost::shared_ptr<Transactor> pointer;
static Transactor::pointer makeTransactor(const SerializedTransaction& txn,TransactionEngineParams params, TransactionEngine* engine);
static std::auto_ptr<Transactor> makeTransactor(const SerializedTransaction& txn,TransactionEngineParams params, TransactionEngine* engine);
TER apply();
};