瀏覽代碼

minor cleanup: include orders, end comments etc.

- no code changes
tags/v0.15.1
Philip Kaufmann 7 年之前
父節點
當前提交
771d500283
共有 9 個檔案被更改,包括 25 行新增24 行删除
  1. 4
    4
      src/Makefile.test.include
  2. 1
    1
      src/ecwrapper.cpp
  3. 2
    2
      src/ecwrapper.h
  4. 7
    9
      src/main.h
  5. 4
    1
      src/qt/optionsdialog.h
  6. 1
    1
      src/rpcblockchain.cpp
  7. 1
    1
      src/rpcserver.h
  8. 3
    3
      src/txmempool.cpp
  9. 2
    2
      src/utilstrencodings.cpp

+ 4
- 4
src/Makefile.test.include 查看文件

@@ -42,8 +42,8 @@ BITCOIN_TESTS =\
test/bloom_tests.cpp \
test/checkblock_tests.cpp \
test/Checkpoints_tests.cpp \
test/compress_tests.cpp \
test/coins_tests.cpp \
test/compress_tests.cpp \
test/crypto_tests.cpp \
test/DoS_tests.cpp \
test/getarg_tests.cpp \
@@ -58,7 +58,9 @@ BITCOIN_TESTS =\
test/rpc_tests.cpp \
test/script_P2SH_tests.cpp \
test/script_tests.cpp \
test/scriptnum_tests.cpp \
test/serialize_tests.cpp \
test/sighash_tests.cpp \
test/sigopcount_tests.cpp \
test/skiplist_tests.cpp \
test/test_bitcoin.cpp \
@@ -66,9 +68,7 @@ BITCOIN_TESTS =\
test/transaction_tests.cpp \
test/uint256_tests.cpp \
test/univalue_tests.cpp \
test/util_tests.cpp \
test/scriptnum_tests.cpp \
test/sighash_tests.cpp
test/util_tests.cpp

if ENABLE_WALLET
BITCOIN_TESTS += \

+ 1
- 1
src/ecwrapper.cpp 查看文件

@@ -1,5 +1,5 @@
// Copyright (c) 2009-2014 The Bitcoin developers
// Distributed under the MIT/X11 software license, see the accompanying
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.

#include "ecwrapper.h"

+ 2
- 2
src/ecwrapper.h 查看文件

@@ -1,5 +1,5 @@
// Copyright (c) 2009-2014 The Bitcoin developers
// Distributed under the MIT/X11 software license, see the accompanying
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.

#ifndef BITCOIN_EC_WRAPPER_H
@@ -43,4 +43,4 @@ public:
static bool SanityCheck();
};

#endif
#endif // BITCOIN_EC_WRAPPER_H

+ 7
- 9
src/main.h 查看文件

@@ -39,8 +39,15 @@
#include <boost/unordered_map.hpp>

class CBlockIndex;
class CBlockTreeDB;
class CBloomFilter;
class CInv;
class CScriptCheck;
class CValidationInterface;
class CValidationState;

struct CBlockTemplate;
struct CNodeStateStats;

/** The maximum allowed size for a serialized block, in bytes (network rule) */
static const unsigned int MAX_BLOCK_SIZE = 1000000;
@@ -128,15 +135,6 @@ extern CBlockIndex *pindexBestHeader;
// Minimum disk space required - used in CheckDiskSpace()
static const uint64_t nMinDiskSpace = 52428800;


class CBlockTreeDB;
class CScriptCheck;
class CValidationState;
class CValidationInterface;
struct CNodeStateStats;

struct CBlockTemplate;

/** Register a wallet to receive updates from core */
void RegisterValidationInterface(CValidationInterface* pwalletIn);
/** Unregister a wallet from core */

+ 4
- 1
src/qt/optionsdialog.h 查看文件

@@ -7,10 +7,13 @@

#include <QDialog>

class QDataWidgetMapper;
class OptionsModel;
class QValidatedLineEdit;

QT_BEGIN_NAMESPACE
class QDataWidgetMapper;
QT_END_NAMESPACE

namespace Ui {
class OptionsDialog;
}

+ 1
- 1
src/rpcblockchain.cpp 查看文件

@@ -474,7 +474,7 @@ struct CompareBlocksByHeight
bool operator()(const CBlockIndex* a, const CBlockIndex* b) const
{
/* Make sure that unequal blocks with the same height do not compare
equal. Use the pointers themselves to make a distinction. */
equal. Use the pointers themselves to make a distinction. */

if (a->nHeight != b->nHeight)
return (a->nHeight > b->nHeight);

+ 1
- 1
src/rpcserver.h 查看文件

@@ -7,8 +7,8 @@
#define _BITCOINRPC_SERVER_H_

#include "amount.h"
#include "uint256.h"
#include "rpcprotocol.h"
#include "uint256.h"

#include <list>
#include <map>

+ 3
- 3
src/txmempool.cpp 查看文件

@@ -332,7 +332,7 @@ public:
size_t numEntries;
filein >> numEntries;
if (numEntries <= 0 || numEntries > 10000)
throw runtime_error("Corrupt estimates file. Must have between 1 and 10k entires.");
throw runtime_error("Corrupt estimates file. Must have between 1 and 10k entires.");

std::vector<CBlockAverage> fileHistory;
@@ -343,8 +343,8 @@ public:
fileHistory.push_back(entry);
}

//Now that we've processed the entire fee estimate data file and not
//thrown any errors, we can copy it to our history
// Now that we've processed the entire fee estimate data file and not
// thrown any errors, we can copy it to our history
nBestSeenHeight = nFileBestSeenHeight;
history = fileHistory;
assert(history.size() > 0);

+ 2
- 2
src/utilstrencodings.cpp 查看文件

@@ -7,10 +7,10 @@

#include "tinyformat.h"

#include <errno.h>
#include <limits>
#include <cstdlib>
#include <cstring>
#include <errno.h>
#include <limits>

using namespace std;


Loading…
取消
儲存