From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Tue, 17 Jan 2012 03:27:59 +0000 (-0500)
Subject: Merge branch '0.4.x' into 0.5.0.x
X-Git-Tag: v0.4.0-unstable~129^2~1^2~18^2~10^2~29^2
X-Git-Url: https://git.novaco.in/?a=commitdiff_plain;h=70550ed81be022c81826791a75dd1567db1d667b;hp=5df96269d30ec57e69676e6937b45b3608df98ac;p=novacoin.git

Merge branch '0.4.x' into 0.5.0.x
---

diff --git a/src/checkpoints.cpp b/src/checkpoints.cpp
index c7e054d..508f72b 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 fd086fa..99f1877 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 8fe7e2a..18bafd0 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 */
diff --git a/src/net.h b/src/net.h
index 03da382..8a74b25 100644
--- a/src/net.h
+++ b/src/net.h
@@ -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/serialize.h b/src/serialize.h
index 5bee071..d5d6e61 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 ca7cf67..f81b244 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);