Merge pull request #5186

771d500 minor cleanup: include orders, end comments etc. (Philip Kaufmann)
This commit is contained in:
Wladimir J. van der Laan 2014-11-03 14:55:28 +01:00
commit 4e852e57b1
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
9 changed files with 25 additions and 24 deletions

View File

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

View File

@ -1,5 +1,5 @@
// Copyright (c) 2009-2014 The Bitcoin developers // 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. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "ecwrapper.h" #include "ecwrapper.h"

View File

@ -1,5 +1,5 @@
// Copyright (c) 2009-2014 The Bitcoin developers // 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. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#ifndef BITCOIN_EC_WRAPPER_H #ifndef BITCOIN_EC_WRAPPER_H
@ -43,4 +43,4 @@ public:
static bool SanityCheck(); static bool SanityCheck();
}; };
#endif #endif // BITCOIN_EC_WRAPPER_H

View File

@ -39,8 +39,15 @@
#include <boost/unordered_map.hpp> #include <boost/unordered_map.hpp>
class CBlockIndex; class CBlockIndex;
class CBlockTreeDB;
class CBloomFilter; class CBloomFilter;
class CInv; class CInv;
class CScriptCheck;
class CValidationInterface;
class CValidationState;
struct CBlockTemplate;
struct CNodeStateStats;
/** The maximum allowed size for a serialized block, in bytes (network rule) */ /** The maximum allowed size for a serialized block, in bytes (network rule) */
static const unsigned int MAX_BLOCK_SIZE = 1000000; static const unsigned int MAX_BLOCK_SIZE = 1000000;
@ -128,15 +135,6 @@ extern CBlockIndex *pindexBestHeader;
// Minimum disk space required - used in CheckDiskSpace() // Minimum disk space required - used in CheckDiskSpace()
static const uint64_t nMinDiskSpace = 52428800; 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 */ /** Register a wallet to receive updates from core */
void RegisterValidationInterface(CValidationInterface* pwalletIn); void RegisterValidationInterface(CValidationInterface* pwalletIn);
/** Unregister a wallet from core */ /** Unregister a wallet from core */

View File

@ -7,10 +7,13 @@
#include <QDialog> #include <QDialog>
class QDataWidgetMapper;
class OptionsModel; class OptionsModel;
class QValidatedLineEdit; class QValidatedLineEdit;
QT_BEGIN_NAMESPACE
class QDataWidgetMapper;
QT_END_NAMESPACE
namespace Ui { namespace Ui {
class OptionsDialog; class OptionsDialog;
} }

View File

@ -7,8 +7,8 @@
#define _BITCOINRPC_SERVER_H_ #define _BITCOINRPC_SERVER_H_
#include "amount.h" #include "amount.h"
#include "uint256.h"
#include "rpcprotocol.h" #include "rpcprotocol.h"
#include "uint256.h"
#include <list> #include <list>
#include <map> #include <map>

View File

@ -7,10 +7,10 @@
#include "tinyformat.h" #include "tinyformat.h"
#include <errno.h>
#include <limits>
#include <cstdlib> #include <cstdlib>
#include <cstring> #include <cstring>
#include <errno.h>
#include <limits>
using namespace std; using namespace std;