From e72de1864ffc0b67310b2784a7575b61309347e4 Mon Sep 17 00:00:00 2001 From: Philip Kaufmann Date: Tue, 27 Oct 2015 17:44:13 +0100 Subject: [PATCH] [Trivial] ensure minimal header conventions - ensure header namespaces and end comments are correct - add missing header end comments - ensure minimal formatting (add newlines etc.) Zcash: left out change to src/policy/policy.h which we don't yet have. --- src/bench/bench.cpp | 2 ++ src/bench/bench.h | 23 ++++++++++++----------- src/memusage.h | 2 +- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/src/bench/bench.cpp b/src/bench/bench.cpp index 89c3b0cc2..6ee3cdc27 100644 --- a/src/bench/bench.cpp +++ b/src/bench/bench.cpp @@ -1,7 +1,9 @@ // Copyright (c) 2015 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. + #include "bench.h" + #include #include diff --git a/src/bench/bench.h b/src/bench/bench.h index bf591a2be..5ce13c642 100644 --- a/src/bench/bench.h +++ b/src/bench/bench.h @@ -1,8 +1,16 @@ // Copyright (c) 2015 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // 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 +#include + +#include +#include +#include // Simple micro-benchmarking framework; API mostly matches a subset of the Google Benchmark // framework (see https://github.com/google/benchmark) @@ -25,14 +33,7 @@ static void CODE_TO_TIME(benchmark::State& state) BENCHMARK(CODE_TO_TIME); */ - - -#include -#include -#include -#include -#include - + namespace benchmark { class State { @@ -68,4 +69,4 @@ namespace benchmark { #define BENCHMARK(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 diff --git a/src/memusage.h b/src/memusage.h index 87e652557..e3e60d0a0 100644 --- a/src/memusage.h +++ b/src/memusage.h @@ -117,4 +117,4 @@ static inline size_t DynamicUsage(const boost::unordered_map& m) } -#endif +#endif // BITCOIN_MEMUSAGE_H