LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

Merge pull request #6892

Browse source 
214de7e [Trivial] ensure minimal header conventions (Philip Kaufmann)
This commit is contained in:
Pieter Wuille 2015-10-28 02:25:45 +01:00
commit 4764f5db9d
No known key found for this signature in database
GPG key ID: DBA1A67379A1A931
4 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/bench/bench.cpp
View file

@ -1,7 +1,9 @@
// Copyright (c) 2015 The Bitcoin Core developers // Copyright (c) 2015 The Bitcoin Core developers
// Distributed under the MIT 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 "bench.h" #include "bench.h"
#include <iostream> #include <iostream>
#include <sys/time.h> #include <sys/time.h>

21
src/bench/bench.h
View file

@ -1,8 +1,16 @@
// Copyright (c) 2015 The Bitcoin Core developers // Copyright (c) 2015 The Bitcoin Core developers
// Distributed under the MIT 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_BENCH_H
#define BITCOIN_BENCH_H #ifndef BITCOIN_BENCH_BENCH_H
#define BITCOIN_BENCH_BENCH_H
#include <map>
#include <string>
#include <boost/function.hpp>
#include <boost/preprocessor/cat.hpp>
#include <boost/preprocessor/stringize.hpp>
// Simple micro-benchmarking framework; API mostly matches a subset of the Google Benchmark // Simple micro-benchmarking framework; API mostly matches a subset of the Google Benchmark
// framework (see https://github.com/google/benchmark) // framework (see https://github.com/google/benchmark)
@ -26,13 +34,6 @@ BENCHMARK(CODE_TO_TIME);
*/ */
#include <boost/function.hpp>
#include <boost/preprocessor/cat.hpp>
#include <boost/preprocessor/stringize.hpp>
#include <map>
#include <string>
namespace benchmark { namespace benchmark {
class State { class State {
@ -68,4 +69,4 @@ namespace benchmark {
#define BENCHMARK(n) \ #define BENCHMARK(n) \
benchmark::BenchRunner BOOST_PP_CAT(bench_, BOOST_PP_CAT(__LINE__, n))(BOOST_PP_STRINGIZE(n), n); benchmark::BenchRunner BOOST_PP_CAT(bench_, BOOST_PP_CAT(__LINE__, n))(BOOST_PP_STRINGIZE(n), n);
#endif // BITCOIN_BENCH_H #endif // BITCOIN_BENCH_BENCH_H

2
src/memusage.h
View file

@ -121,4 +121,4 @@ static inline size_t DynamicUsage(const boost::unordered_map<X, Y, Z>& m)
} }
#endif #endif // BITCOIN_MEMUSAGE_H

6
src/policy/policy.h
View file

@ -3,8 +3,8 @@
// Distributed under the MIT 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_POLICY_H #ifndef BITCOIN_POLICY_POLICY_H
#define BITCOIN_POLICY_H #define BITCOIN_POLICY_POLICY_H
#include "consensus/consensus.h" #include "consensus/consensus.h"
#include "script/interpreter.h" #include "script/interpreter.h"
@ -59,4 +59,4 @@ bool IsStandardTx(const CTransaction& tx, std::string& reason);
*/ */
bool AreInputsStandard(const CTransaction& tx, const CCoinsViewCache& mapInputs); bool AreInputsStandard(const CTransaction& tx, const CCoinsViewCache& mapInputs);
#endif // BITCOIN_POLICY_H #endif // BITCOIN_POLICY_POLICY_H