From 5b2c08668c2bab4120b02830d38416c3402b7894 Mon Sep 17 00:00:00 2001
From: Louis Dionne <ldionne.2@gmail.com>
Date: Sun, 3 Dec 2017 17:45:07 -0800
Subject: [PATCH] Enforce using a semicolon after BENCHMARK_MAIN to remove
 compiler warnings (#495)

---
 include/benchmark/benchmark.h  | 3 ++-
 test/basic_test.cc             | 2 +-
 test/benchmark_test.cc         | 2 +-
 test/cxx03_test.cc             | 2 +-
 test/fixture_test.cc           | 2 +-
 test/map_test.cc               | 2 +-
 test/multiple_ranges_test.cc   | 2 +-
 test/options_test.cc           | 2 +-
 test/templated_fixture_test.cc | 2 +-
 9 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/include/benchmark/benchmark.h b/include/benchmark/benchmark.h
index 364135f5..340cbc1e 100644
--- a/include/benchmark/benchmark.h
+++ b/include/benchmark/benchmark.h
@@ -1146,7 +1146,8 @@ class Fixture : public internal::Benchmark {
     ::benchmark::Initialize(&argc, argv);  \
     if (::benchmark::ReportUnrecognizedArguments(argc, argv)) return 1; \
     ::benchmark::RunSpecifiedBenchmarks(); \
-  }
+  }                                        \
+  int main(int, char**)
 
 
 // ------------------------------------------------------
diff --git a/test/basic_test.cc b/test/basic_test.cc
index 8a27b925..3348781c 100644
--- a/test/basic_test.cc
+++ b/test/basic_test.cc
@@ -115,4 +115,4 @@ void BM_RangedFor(benchmark::State& state) {
 }
 BENCHMARK(BM_RangedFor);
 
-BENCHMARK_MAIN()
+BENCHMARK_MAIN();
diff --git a/test/benchmark_test.cc b/test/benchmark_test.cc
index d4326012..78802c8d 100644
--- a/test/benchmark_test.cc
+++ b/test/benchmark_test.cc
@@ -241,4 +241,4 @@ BENCHMARK(BM_DenseThreadRanges)->Arg(1)->DenseThreadRange(1, 3);
 BENCHMARK(BM_DenseThreadRanges)->Arg(2)->DenseThreadRange(1, 4, 2);
 BENCHMARK(BM_DenseThreadRanges)->Arg(3)->DenseThreadRange(5, 14, 3);
 
-BENCHMARK_MAIN()
+BENCHMARK_MAIN();
diff --git a/test/cxx03_test.cc b/test/cxx03_test.cc
index cc8abaf7..baa9ed92 100644
--- a/test/cxx03_test.cc
+++ b/test/cxx03_test.cc
@@ -60,4 +60,4 @@ void BM_counters(benchmark::State& state) {
 }
 BENCHMARK(BM_counters);
 
-BENCHMARK_MAIN()
+BENCHMARK_MAIN();
diff --git a/test/fixture_test.cc b/test/fixture_test.cc
index 9b0b0e17..1462b10f 100644
--- a/test/fixture_test.cc
+++ b/test/fixture_test.cc
@@ -46,4 +46,4 @@ BENCHMARK_DEFINE_F(MyFixture, Bar)(benchmark::State& st) {
 BENCHMARK_REGISTER_F(MyFixture, Bar)->Arg(42);
 BENCHMARK_REGISTER_F(MyFixture, Bar)->Arg(42)->ThreadPerCpu();
 
-BENCHMARK_MAIN()
+BENCHMARK_MAIN();
diff --git a/test/map_test.cc b/test/map_test.cc
index 0f8238d9..311d2d22 100644
--- a/test/map_test.cc
+++ b/test/map_test.cc
@@ -54,4 +54,4 @@ BENCHMARK_DEFINE_F(MapFixture, Lookup)(benchmark::State& state) {
 }
 BENCHMARK_REGISTER_F(MapFixture, Lookup)->Range(1 << 3, 1 << 12);
 
-BENCHMARK_MAIN()
+BENCHMARK_MAIN();
diff --git a/test/multiple_ranges_test.cc b/test/multiple_ranges_test.cc
index 6a3a6d85..0a82382f 100644
--- a/test/multiple_ranges_test.cc
+++ b/test/multiple_ranges_test.cc
@@ -71,4 +71,4 @@ static void BM_MultipleRanges(benchmark::State& st) {
 }
 BENCHMARK(BM_MultipleRanges)->Ranges({{5, 5}, {6, 6}});
 
-BENCHMARK_MAIN()
+BENCHMARK_MAIN();
diff --git a/test/options_test.cc b/test/options_test.cc
index 0690a13f..fdec6917 100644
--- a/test/options_test.cc
+++ b/test/options_test.cc
@@ -62,4 +62,4 @@ void BM_explicit_iteration_count(benchmark::State& state) {
 }
 BENCHMARK(BM_explicit_iteration_count)->Iterations(42);
 
-BENCHMARK_MAIN()
+BENCHMARK_MAIN();
diff --git a/test/templated_fixture_test.cc b/test/templated_fixture_test.cc
index 9341b786..ec5b4c0c 100644
--- a/test/templated_fixture_test.cc
+++ b/test/templated_fixture_test.cc
@@ -25,4 +25,4 @@ BENCHMARK_TEMPLATE_DEFINE_F(MyFixture, Bar, double)(benchmark::State& st) {
 }
 BENCHMARK_REGISTER_F(MyFixture, Bar);
 
-BENCHMARK_MAIN()
+BENCHMARK_MAIN();