diff options
author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-01-16 22:28:14 -0500 |
---|---|---|
committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-01-16 22:28:14 -0500 |
commit | a5b875f47b3a1ad6d11bc4bcbfcc500fad125d60 (patch) | |
tree | 4635d50ba19ed1205f777378c5d3f0850f38504b | |
parent | 98811f6ad4764f63e510d703d1659589c083fa05 (diff) | |
parent | 70550ed81be022c81826791a75dd1567db1d667b (diff) | |
download | bitcoin-a5b875f47b3a1ad6d11bc4bcbfcc500fad125d60.tar.xz |
Merge branch '0.5.0.x' into 0.5.x
-rw-r--r-- | src/checkpoints.cpp | 1 | ||||
-rw-r--r-- | src/headers.h | 2 | ||||
-rw-r--r-- | src/net.cpp | 3 | ||||
-rw-r--r-- | src/net.h | 4 | ||||
-rw-r--r-- | src/qt/forms/aboutdialog.ui | 2 | ||||
-rw-r--r-- | src/qt/forms/sendcoinsdialog.ui | 3 | ||||
-rw-r--r-- | src/serialize.h | 3 | ||||
-rw-r--r-- | src/wallet.h | 1 |
8 files changed, 10 insertions, 9 deletions
diff --git a/src/checkpoints.cpp b/src/checkpoints.cpp index c7e054df37..508f72b376 100644 --- a/src/checkpoints.cpp +++ b/src/checkpoints.cpp @@ -52,7 +52,6 @@ namespace Checkpoints { if (fTestNet) return NULL; - int64 nResult; BOOST_REVERSE_FOREACH(const MapCheckpoints::value_type& i, mapCheckpoints) { const uint256& hash = i.second; diff --git a/src/headers.h b/src/headers.h index fd086faee8..99f1877cf9 100644 --- a/src/headers.h +++ b/src/headers.h @@ -83,8 +83,6 @@ #endif -#pragma hdrstop - #include "serialize.h" #include "uint256.h" #include "util.h" diff --git a/src/net.cpp b/src/net.cpp index 8fe7e2a389..18bafd02e7 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -1133,7 +1133,6 @@ void ThreadMapPort2(void* parg) char port[6]; sprintf(port, "%d", GetListenPort()); - const char * rootdescurl = 0; const char * multicastif = 0; const char * minissdpdpath = 0; struct UPNPDev * devlist = 0; @@ -1155,8 +1154,6 @@ void ThreadMapPort2(void* parg) r = UPNP_GetValidIGD(devlist, &urls, &data, lanaddr, sizeof(lanaddr)); if (r == 1) { - char intClient[16]; - char intPort[6]; string strDesc = "Bitcoin " + FormatFullVersion(); #ifndef UPNPDISCOVER_SUCCESS /* miniupnpc 1.5 */ @@ -271,7 +271,9 @@ public: // Make sure not to reuse time indexes to keep things in the same order int64 nNow = (GetTime() - 1) * 1000000; static int64 nLastTime; - nLastTime = nNow = std::max(nNow, ++nLastTime); + ++nLastTime; + nNow = std::max(nNow, nLastTime); + nLastTime = nNow; // Each retry is 2 minutes after the last nRequestTime = std::max(nRequestTime + 2 * 60 * 1000000, nNow); diff --git a/src/qt/forms/aboutdialog.ui b/src/qt/forms/aboutdialog.ui index cf7997326c..127b90965a 100644 --- a/src/qt/forms/aboutdialog.ui +++ b/src/qt/forms/aboutdialog.ui @@ -82,7 +82,7 @@ <item> <widget class="QLabel" name="label_2"> <property name="text"> - <string>Copyright © 2009-2011 Bitcoin Developers + <string>Copyright © 2009-2012 Bitcoin Developers This is experimental software. diff --git a/src/qt/forms/sendcoinsdialog.ui b/src/qt/forms/sendcoinsdialog.ui index e5e19e1015..04cf404ae3 100644 --- a/src/qt/forms/sendcoinsdialog.ui +++ b/src/qt/forms/sendcoinsdialog.ui @@ -80,6 +80,9 @@ <verstretch>0</verstretch> </sizepolicy> </property> + <property name="toolTip"> + <string>Remove all transaction fields</string> + </property> <property name="text"> <string>Clear all</string> </property> diff --git a/src/serialize.h b/src/serialize.h index eacf51bc39..79dd25aab5 100644 --- a/src/serialize.h +++ b/src/serialize.h @@ -99,6 +99,7 @@ enum const bool fRead = false; \ unsigned int nSerSize = 0; \ ser_streamplaceholder s; \ + assert(fGetSize||fWrite||fRead); /* suppress warning */ \ s.nType = nType; \ s.nVersion = nVersion; \ {statements} \ @@ -112,6 +113,7 @@ enum const bool fWrite = true; \ const bool fRead = false; \ unsigned int nSerSize = 0; \ + assert(fGetSize||fWrite||fRead); /* suppress warning */ \ {statements} \ } \ template<typename Stream> \ @@ -122,6 +124,7 @@ enum const bool fWrite = false; \ const bool fRead = true; \ unsigned int nSerSize = 0; \ + assert(fGetSize||fWrite||fRead); /* suppress warning */ \ {statements} \ } diff --git a/src/wallet.h b/src/wallet.h index ca7cf67317..f81b2444d6 100644 --- a/src/wallet.h +++ b/src/wallet.h @@ -86,7 +86,6 @@ public: bool CreateTransaction(const std::vector<std::pair<CScript, int64> >& vecSend, CWalletTx& wtxNew, CReserveKey& reservekey, int64& nFeeRet); bool CreateTransaction(CScript scriptPubKey, int64 nValue, CWalletTx& wtxNew, CReserveKey& reservekey, int64& nFeeRet); bool CommitTransaction(CWalletTx& wtxNew, CReserveKey& reservekey); - bool BroadcastTransaction(CWalletTx& wtxNew); std::string SendMoney(CScript scriptPubKey, int64 nValue, CWalletTx& wtxNew, bool fAskFee=false); std::string SendMoneyToBitcoinAddress(const CBitcoinAddress& address, int64 nValue, CWalletTx& wtxNew, bool fAskFee=false); |