Browse Source

Merge pull request #5205

b4347f6 minor code style cleanup after recent merges (Philip Kaufmann)
0.10
Pieter Wuille 10 years ago
parent
commit
be32b5212b
No known key found for this signature in database
GPG Key ID: 57896D2FF8F0B657
  1. 4
      src/alert.cpp
  2. 4
      src/crypter.h
  3. 5
      src/eccryptoverify.cpp
  4. 12
      src/eccryptoverify.h
  5. 2
      src/ecwrapper.h
  6. 3
      src/hash.h
  7. 2
      src/key.h
  8. 3
      src/leveldbwrapper.cpp
  9. 2
      src/pubkey.cpp
  10. 4
      src/pubkey.h
  11. 4
      src/script/standard.h

4
src/alert.cpp

@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
// Copyright (c) 2010 Satoshi Nakamoto
// 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 "alert.h"
#include "chainparams.h"
#include "clientversion.h"
#include "pubkey.h"
#include "net.h"
#include "pubkey.h"
#include "timedata.h"
#include "ui_interface.h"
#include "util.h"

4
src/crypter.h

@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
// Copyright (c) 2009-2013 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_CRYPTER_H
#define BITCOIN_CRYPTER_H
#include "allocators.h"
#include "serialize.h"
#include "keystore.h"
#include "serialize.h"
class uint256;

5
src/eccryptoverify.cpp

@ -1,3 +1,8 @@ @@ -1,3 +1,8 @@
// Copyright (c) 2009-2010 Satoshi Nakamoto
// Copyright (c) 2009-2014 The Bitcoin developers
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "eccryptoverify.h"
namespace {

12
src/eccryptoverify.h

@ -1,13 +1,14 @@ @@ -1,13 +1,14 @@
// Copyright (c) 2009-2010 Satoshi Nakamoto
// Copyright (c) 2009-2013 The Bitcoin developers
// Distributed under the MIT/X11 software license, see the accompanying
// Copyright (c) 2009-2014 The Bitcoin developers
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#ifndef BITCOIN_EC_CRYPTO_VERIFY_H
#define BITCOIN_EC_CRYPTO_VERIFY_H
#ifndef BITCOIN_ECCRYPTOVERIFY_H
#define BITCOIN_ECCRYPTOVERIFY_H
#include <vector>
#include <cstdlib>
class uint256;
namespace eccrypto {
@ -16,4 +17,5 @@ bool Check(const unsigned char *vch); @@ -16,4 +17,5 @@ bool Check(const unsigned char *vch);
bool CheckSignatureElement(const unsigned char *vch, int len, bool half);
} // eccrypto namespace
#endif
#endif // BITCOIN_ECCRYPTOVERIFY_H

2
src/ecwrapper.h

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

3
src/hash.h

@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
// Copyright (c) 2009-2010 Satoshi Nakamoto
// Copyright (c) 2009-2013 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_HASH_H
@ -160,4 +160,5 @@ uint256 SerializeHash(const T& obj, int nType=SER_GETHASH, int nVersion=PROTOCOL @@ -160,4 +160,5 @@ uint256 SerializeHash(const T& obj, int nType=SER_GETHASH, int nVersion=PROTOCOL
unsigned int MurmurHash3(unsigned int nHashSeed, const std::vector<unsigned char>& vDataToHash);
void BIP32Hash(const unsigned char chainCode[32], unsigned int nChild, unsigned char header, const unsigned char data[32], unsigned char output[64]);
#endif // BITCOIN_HASH_H

2
src/key.h

@ -13,8 +13,8 @@ @@ -13,8 +13,8 @@
#include <stdexcept>
#include <vector>
class CPubKey;
class CExtPubKey;
class CPubKey;
/**
* secp256k1:

3
src/leveldbwrapper.cpp

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
// Copyright (c) 2012-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 "leveldbwrapper.h"
@ -7,6 +7,7 @@ @@ -7,6 +7,7 @@
#include "util.h"
#include <boost/filesystem.hpp>
#include <leveldb/cache.h>
#include <leveldb/env.h>
#include <leveldb/filter_policy.h>

2
src/pubkey.cpp

@ -1,5 +1,5 @@ @@ -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 "pubkey.h"

4
src/pubkey.h

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

4
src/script/standard.h

@ -6,15 +6,15 @@ @@ -6,15 +6,15 @@
#ifndef BITCOIN_SCRIPT_STANDARD_H
#define BITCOIN_SCRIPT_STANDARD_H
#include "uint256.h"
#include "script/interpreter.h"
#include "uint256.h"
#include <boost/variant.hpp>
#include <stdint.h>
class CScript;
class CKeyID;
class CScript;
/** A reference to a CScript: the Hash160 of its serialization (see script.h) */
class CScriptID : public uint160

Loading…
Cancel
Save