This commit is contained in:
jed
2012-11-29 18:28:49 -08:00
parent 9ce31adc28
commit 0865c99cee
2 changed files with 3 additions and 1 deletions

View File

@@ -82,11 +82,13 @@ void sigIntHandler(int)
void Application::run() void Application::run()
{ {
#ifndef WIN32
#ifdef SIGINT #ifdef SIGINT
struct sigaction sa; struct sigaction sa;
memset(&sa, 0, sizeof(sa)); memset(&sa, 0, sizeof(sa));
sa.sa_handler = sigIntHandler; sa.sa_handler = sigIntHandler;
sigaction(SIGINT, &sa, NULL); sigaction(SIGINT, &sa, NULL);
#endif
#endif #endif
assert(mTxnDB == NULL); assert(mTxnDB == NULL);

View File

@@ -911,7 +911,7 @@ std::vector< std::pair<Transaction::pointer, TransactionMetaSet::pointer> >
}else rawMeta.resize(metaSize); }else rawMeta.resize(metaSize);
TransactionMetaSet::pointer meta= boost::make_shared<TransactionMetaSet>(txn->getID(), txn->getLedger(), rawMeta.getData()); TransactionMetaSet::pointer meta= boost::make_shared<TransactionMetaSet>(txn->getID(), txn->getLedger(), rawMeta.getData());
ret.push_back(std::make_pair<Transaction::pointer, TransactionMetaSet::pointer>(txn,meta)); ret.push_back(std::pair<Transaction::pointer, TransactionMetaSet::pointer>(txn,meta));
} }
} }