neobytes-project/neobytes
neobytes-project/neobytes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:bitcoin/bitcoin

Browse Source
This commit is contained in:
Gavin Andresen 2013-01-29 22:24:35 -05:00
commit 2998083005
2 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main.cpp
View File

@ -93,15 +93,6 @@ void UnregisterWallet(CWallet* pwalletIn)
} }
} }
// check whether the passed transaction is from us
bool static IsFromMe(CTransaction& tx)
{
BOOST_FOREACH(CWallet* pwallet, setpwalletRegistered)
if (pwallet->IsFromMe(tx))
return true;
return false;
}
// get the wallet transaction with the given hash (if it exists) // get the wallet transaction with the given hash (if it exists)
bool static GetTransaction(const uint256& hashTx, CWalletTx& wtx) bool static GetTransaction(const uint256& hashTx, CWalletTx& wtx)
{ {

2
src/main.h
View File

@ -106,7 +106,7 @@ static const uint64 nMinDiskSpace = 52428800;
class CReserveKey; class CReserveKey;
class CCoinsDB; class CCoinsDB;
class CBlockTreeDB; class CBlockTreeDB;
class CDiskBlockPos; struct CDiskBlockPos;
class CCoins; class CCoins;
class CTxUndo; class CTxUndo;
class CCoinsView; class CCoinsView;