aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGavin Andresen <gavinandresen@gmail.com>2013-01-29 22:24:35 -0500
committerGavin Andresen <gavinandresen@gmail.com>2013-01-29 22:24:35 -0500
commit299808300504159e8bf108581add76b5ce4d32cd (patch)
tree633f968955f13b1d98efa7fe51ac450870e32961
parent9126e08739f5115c3032997cabd23f27037131ef (diff)
parent716c35b67f042a6604fd5136b758135bdf80a31e (diff)
Merge branch 'master' of github.com:bitcoin/bitcoin
-rw-r--r--src/main.cpp9
-rw-r--r--src/main.h2
2 files changed, 1 insertions, 10 deletions
diff --git a/src/main.cpp b/src/main.cpp
index fe35fbaf29..e9e7b004c7 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -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)
bool static GetTransaction(const uint256& hashTx, CWalletTx& wtx)
{
diff --git a/src/main.h b/src/main.h
index 9dbcac0b5a..202708f8cd 100644
--- a/src/main.h
+++ b/src/main.h
@@ -106,7 +106,7 @@ static const uint64 nMinDiskSpace = 52428800;
class CReserveKey;
class CCoinsDB;
class CBlockTreeDB;
-class CDiskBlockPos;
+struct CDiskBlockPos;
class CCoins;
class CTxUndo;
class CCoinsView;