Merge branch 'master' of github.com:novacoin-project/novacoin

diff --combined src/main.h
index 64e0f0f,cb7650c..0a9a663
--- 1/src/main.h
--- 2/src/main.h
+++ b/src/main.h
@@@ -113,7 -113,7 +113,7 @@@ bool LoadBlockIndex(bool fAllowNew=true
  void PrintBlockTree();
  CBlockIndex* FindBlockByHeight(int nHeight);
  bool ProcessMessages(CNode* pfrom);
 -bool SendMessages(CNode* pto, bool fSendTrickle);
 +bool SendMessages(CNode* pto);
  bool LoadExternalBlockFile(FILE* fileIn);
  
  // Run an instance of the script checking thread
@@@ -620,8 -620,7 +620,7 @@@ public
          try {
              filein >> *this;
          }
-         catch (std::exception &e) {
-             (void)e;
+         catch (const std::exception&) {
              return error("%s() : deserialize or I/O error", BOOST_CURRENT_FUNCTION);
          }
  
@@@ -795,7 -794,7 +794,7 @@@ public
      )
  
  
-     int SetMerkleBranch(const CBlock* pblock=NULL);
+     int SetMerkleBranch(const CBlock* pblock);
      int GetDepthInMainChain(CBlockIndex* &pindexRet) const;
      int GetDepthInMainChain() const { CBlockIndex *pindexRet; return GetDepthInMainChain(pindexRet); }
      bool IsInMainChain() const { return GetDepthInMainChain() > 0; }
@@@ -1096,8 -1095,7 +1095,7 @@@ public
          try {
              filein >> *this;
          }
-         catch (std::exception &e) {
-             (void)e;
+         catch (const std::exception&) {
              return error("%s() : deserialize or I/O error", BOOST_CURRENT_FUNCTION);
          }