From: Christopher Dykes Date: Tue, 26 Jul 2016 15:37:22 +0000 (-0700) Subject: Handle MSVC's preprocessor oddities in the SharedMutex test X-Git-Tag: 2016.07.26 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=66950202701a4fa60fde106f5bcae6d8dbe4327d;p=folly.git Handle MSVC's preprocessor oddities in the SharedMutex test Summary: MSVC needs a bit more glue to expand the varargs. Reviewed By: yfeldblum Differential Revision: D3614681 fbshipit-source-id: 901d8c5138b1d2d28434c51bdff31f6d21f26681 --- diff --git a/folly/test/SharedMutexTest.cpp b/folly/test/SharedMutexTest.cpp index 43e6dd17..7ca55239 100644 --- a/folly/test/SharedMutexTest.cpp +++ b/folly/test/SharedMutexTest.cpp @@ -1371,8 +1371,8 @@ BENCHMARK(single_thread_lock_unlock, iters) { } } -#define BENCH_BASE(...) BENCHMARK_NAMED_PARAM(__VA_ARGS__) -#define BENCH_REL(...) BENCHMARK_RELATIVE_NAMED_PARAM(__VA_ARGS__) +#define BENCH_BASE(...) FB_VA_GLUE(BENCHMARK_NAMED_PARAM, (__VA_ARGS__)) +#define BENCH_REL(...) FB_VA_GLUE(BENCHMARK_RELATIVE_NAMED_PARAM, (__VA_ARGS__)) // 100% reads. Best-case scenario for deferred locks. Lock is colocated // with read data, so inline lock takes cache miss every time but deferred