[Trivial] ensure minimal header conventions

random-zebra · random-zebra · commit a5179b63a25e · 2020-05-28T02:12:41.000+02:00
backports bitcoin/bitcoin@214de7e - ensure header namespaces and end comments are correct - add missing header end comments - ensure minimal formatting (add newlines etc.)
diff --git 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 <iostream>
 #include <sys/time.h>
 
diff --git 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 <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
 // framework (see https://github.com/google/benchmark)
@@ -24,12 +32,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 {
 
     class State {
@@ -65,4 +67,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
@@ -116,4 +116,4 @@ static inline size_t DynamicUsage(const X& x)
 
 }
 
-#endif
+#endif // BITCOIN_MEMUSAGE_H

Original file line number	Diff line number	Diff line change
`@@ -116,4 +116,4 @@ static inline size_t DynamicUsage(const X& x)`
`116`	`116`
`117`	`117`	`}`
`118`	`118`
`119`		`-#endif`
	`119`	`+#endif // BITCOIN_MEMUSAGE_H`