Commit 16e21953 by Abseil Team Committed by Copybara-Service

Remove redundant semicolons introduced by macros

PiperOrigin-RevId: 616083064
Change-Id: I3d69303d32431227c197247682f8dcb70f9a239d
parent d0d902e6
...@@ -84,6 +84,7 @@ list(APPEND ABSL_GCC_TEST_FLAGS ...@@ -84,6 +84,7 @@ list(APPEND ABSL_GCC_TEST_FLAGS
list(APPEND ABSL_LLVM_FLAGS list(APPEND ABSL_LLVM_FLAGS
"-Wall" "-Wall"
"-Wextra" "-Wextra"
"-Wc++98-compat-extra-semi"
"-Wcast-qual" "-Wcast-qual"
"-Wconversion" "-Wconversion"
"-Wdead-code-aggressive" "-Wdead-code-aggressive"
...@@ -123,6 +124,7 @@ list(APPEND ABSL_LLVM_FLAGS ...@@ -123,6 +124,7 @@ list(APPEND ABSL_LLVM_FLAGS
list(APPEND ABSL_LLVM_TEST_FLAGS list(APPEND ABSL_LLVM_TEST_FLAGS
"-Wall" "-Wall"
"-Wextra" "-Wextra"
"-Wc++98-compat-extra-semi"
"-Wcast-qual" "-Wcast-qual"
"-Wconversion" "-Wconversion"
"-Wdead-code-aggressive" "-Wdead-code-aggressive"
......
...@@ -85,6 +85,7 @@ ABSL_GCC_TEST_FLAGS = [ ...@@ -85,6 +85,7 @@ ABSL_GCC_TEST_FLAGS = [
ABSL_LLVM_FLAGS = [ ABSL_LLVM_FLAGS = [
"-Wall", "-Wall",
"-Wextra", "-Wextra",
"-Wc++98-compat-extra-semi",
"-Wcast-qual", "-Wcast-qual",
"-Wconversion", "-Wconversion",
"-Wdead-code-aggressive", "-Wdead-code-aggressive",
...@@ -124,6 +125,7 @@ ABSL_LLVM_FLAGS = [ ...@@ -124,6 +125,7 @@ ABSL_LLVM_FLAGS = [
ABSL_LLVM_TEST_FLAGS = [ ABSL_LLVM_TEST_FLAGS = [
"-Wall", "-Wall",
"-Wextra", "-Wextra",
"-Wc++98-compat-extra-semi",
"-Wcast-qual", "-Wcast-qual",
"-Wconversion", "-Wconversion",
"-Wdead-code-aggressive", "-Wdead-code-aggressive",
......
...@@ -44,6 +44,7 @@ ABSL_GCC_TEST_ADDITIONAL_FLAGS = [ ...@@ -44,6 +44,7 @@ ABSL_GCC_TEST_ADDITIONAL_FLAGS = [
ABSL_LLVM_FLAGS = [ ABSL_LLVM_FLAGS = [
"-Wall", "-Wall",
"-Wextra", "-Wextra",
"-Wc++98-compat-extra-semi",
"-Wcast-qual", "-Wcast-qual",
"-Wconversion", "-Wconversion",
"-Wdead-code-aggressive", "-Wdead-code-aggressive",
......
...@@ -143,7 +143,7 @@ constexpr size_t kNumFlags = 0 REPLICATE(COUNT, _, _); ...@@ -143,7 +143,7 @@ constexpr size_t kNumFlags = 0 REPLICATE(COUNT, _, _);
#pragma clang section data = ".benchmark_flags" #pragma clang section data = ".benchmark_flags"
#endif #endif
#define DEFINE_FLAG(T, name, index) ABSL_FLAG(T, name##_##index, {}, ""); #define DEFINE_FLAG(T, name, index) ABSL_FLAG(T, name##_##index, {}, "");
#define FLAG_DEF(T) REPLICATE(DEFINE_FLAG, T, T##_flag); #define FLAG_DEF(T) REPLICATE(DEFINE_FLAG, T, T##_flag)
BENCHMARKED_TYPES(FLAG_DEF) BENCHMARKED_TYPES(FLAG_DEF)
#if defined(__clang__) && defined(__linux__) #if defined(__clang__) && defined(__linux__)
#pragma clang section data = "" #pragma clang section data = ""
......
...@@ -44,31 +44,31 @@ ...@@ -44,31 +44,31 @@
#define FLAG_MULT(x) F3(x) #define FLAG_MULT(x) F3(x)
#define TEST_FLAG_HEADER FLAG_HEADER_ #define TEST_FLAG_HEADER FLAG_HEADER_
#define F(name) ABSL_FLAG(int, name, 0, ""); #define F(name) ABSL_FLAG(int, name, 0, "")
#define F1(name) \ #define F1(name) \
F(name##1); \ F(name##1); \
F(name##2); \ F(name##2); \
F(name##3); \ F(name##3); \
F(name##4); \ F(name##4); \
F(name##5); F(name##5)
/**/ /**/
#define F2(name) \ #define F2(name) \
F1(name##1); \ F1(name##1); \
F1(name##2); \ F1(name##2); \
F1(name##3); \ F1(name##3); \
F1(name##4); \ F1(name##4); \
F1(name##5); F1(name##5)
/**/ /**/
#define F3(name) \ #define F3(name) \
F2(name##1); \ F2(name##1); \
F2(name##2); \ F2(name##2); \
F2(name##3); \ F2(name##3); \
F2(name##4); \ F2(name##4); \
F2(name##5); F2(name##5)
/**/ /**/
FLAG_MULT(TEST_FLAG_HEADER) FLAG_MULT(TEST_FLAG_HEADER);
namespace { namespace {
......
...@@ -160,7 +160,7 @@ absl::flat_hash_set<T> FlatHashSet(size_t count) { ...@@ -160,7 +160,7 @@ absl::flat_hash_set<T> FlatHashSet(size_t count) {
return hash<decltype(__VA_ARGS__)>{}(arg); \ return hash<decltype(__VA_ARGS__)>{}(arg); \
} \ } \
bool absl_hash_test_odr_use##hash##name = \ bool absl_hash_test_odr_use##hash##name = \
(benchmark::DoNotOptimize(&Codegen##hash##name), false); (benchmark::DoNotOptimize(&Codegen##hash##name), false)
MAKE_BENCHMARK(AbslHash, Int32, int32_t{}); MAKE_BENCHMARK(AbslHash, Int32, int32_t{});
MAKE_BENCHMARK(AbslHash, Int64, int64_t{}); MAKE_BENCHMARK(AbslHash, Int64, int64_t{});
...@@ -315,9 +315,9 @@ struct StringRand { ...@@ -315,9 +315,9 @@ struct StringRand {
BENCHMARK(BM_latency_##hash##_##name); \ BENCHMARK(BM_latency_##hash##_##name); \
} // namespace } // namespace
MAKE_LATENCY_BENCHMARK(AbslHash, Int32, PodRand<int32_t>); MAKE_LATENCY_BENCHMARK(AbslHash, Int32, PodRand<int32_t>)
MAKE_LATENCY_BENCHMARK(AbslHash, Int64, PodRand<int64_t>); MAKE_LATENCY_BENCHMARK(AbslHash, Int64, PodRand<int64_t>)
MAKE_LATENCY_BENCHMARK(AbslHash, String9, StringRand<9>); MAKE_LATENCY_BENCHMARK(AbslHash, String9, StringRand<9>)
MAKE_LATENCY_BENCHMARK(AbslHash, String33, StringRand<33>); MAKE_LATENCY_BENCHMARK(AbslHash, String33, StringRand<33>)
MAKE_LATENCY_BENCHMARK(AbslHash, String65, StringRand<65>); MAKE_LATENCY_BENCHMARK(AbslHash, String65, StringRand<65>)
MAKE_LATENCY_BENCHMARK(AbslHash, String257, StringRand<257>); MAKE_LATENCY_BENCHMARK(AbslHash, String257, StringRand<257>)
...@@ -291,7 +291,7 @@ void BM_Thread(benchmark::State& state) { ...@@ -291,7 +291,7 @@ void BM_Thread(benchmark::State& state) {
BENCHMARK_TEMPLATE(BM_Shuffle, Engine, 100)->ThreadPerCpu(); \ BENCHMARK_TEMPLATE(BM_Shuffle, Engine, 100)->ThreadPerCpu(); \
BENCHMARK_TEMPLATE(BM_Shuffle, Engine, 1000)->ThreadPerCpu(); \ BENCHMARK_TEMPLATE(BM_Shuffle, Engine, 1000)->ThreadPerCpu(); \
BENCHMARK_TEMPLATE(BM_ShuffleReuse, Engine, 100)->ThreadPerCpu(); \ BENCHMARK_TEMPLATE(BM_ShuffleReuse, Engine, 100)->ThreadPerCpu(); \
BENCHMARK_TEMPLATE(BM_ShuffleReuse, Engine, 1000)->ThreadPerCpu(); BENCHMARK_TEMPLATE(BM_ShuffleReuse, Engine, 1000)->ThreadPerCpu()
#define BM_EXTENDED(Engine) \ #define BM_EXTENDED(Engine) \
/* -------------- Extended Uniform -----------------------*/ \ /* -------------- Extended Uniform -----------------------*/ \
...@@ -355,7 +355,7 @@ void BM_Thread(benchmark::State& state) { ...@@ -355,7 +355,7 @@ void BM_Thread(benchmark::State& state) {
BENCHMARK_TEMPLATE(BM_Beta, Engine, absl::beta_distribution<float>, 410, \ BENCHMARK_TEMPLATE(BM_Beta, Engine, absl::beta_distribution<float>, 410, \
580); \ 580); \
BENCHMARK_TEMPLATE(BM_Gamma, Engine, std::gamma_distribution<float>, 199); \ BENCHMARK_TEMPLATE(BM_Gamma, Engine, std::gamma_distribution<float>, 199); \
BENCHMARK_TEMPLATE(BM_Gamma, Engine, std::gamma_distribution<double>, 199); BENCHMARK_TEMPLATE(BM_Gamma, Engine, std::gamma_distribution<double>, 199)
// ABSL Recommended interfaces. // ABSL Recommended interfaces.
BM_BASIC(absl::InsecureBitGen); // === pcg64_2018_engine BM_BASIC(absl::InsecureBitGen); // === pcg64_2018_engine
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment