Commit 23bddf52 authored by Andrei Alexandrescu's avatar Andrei Alexandrescu Committed by Dave Watson

Use standard variadic macros instead of gcc-specific ones

Summary: We've intentionally eliminated support for gcc's old variadic macro syntax so as to bring our close in line with compatbile standards. This diff enables folly to build using warp.

Test Plan: built folly

Reviewed By: delong.j@fb.com

FB internal diff: D1176956
parent 02747b6d
...@@ -326,8 +326,8 @@ TEST(MPMCQueue, mt_prod_cons_deterministic) { ...@@ -326,8 +326,8 @@ TEST(MPMCQueue, mt_prod_cons_deterministic) {
"", 10, 10, 1000); "", 10, 10, 1000);
} }
#define PC_BENCH(q, np, nc, nops...) \ #define PC_BENCH(q, np, nc, ...) \
producerConsumerBench(q, #q, (np), (nc), nops) producerConsumerBench(q, #q, (np), (nc), __VA_ARGS__)
TEST(MPMCQueue, mt_prod_cons) { TEST(MPMCQueue, mt_prod_cons) {
int n = 100000; int n = 100000;
...@@ -433,7 +433,7 @@ static void lc_snap() { ...@@ -433,7 +433,7 @@ static void lc_snap() {
} }
} }
#define LIFECYCLE_STEP(args...) lc_step(__LINE__, args) #define LIFECYCLE_STEP(...) lc_step(__LINE__, __VA_ARGS__)
static void lc_step(int lineno, int what = NOTHING, int what2 = NOTHING) { static void lc_step(int lineno, int what = NOTHING, int what2 = NOTHING) {
for (int i = 0; i < MAX_LIFECYCLE_EVENT; ++i) { for (int i = 0; i < MAX_LIFECYCLE_EVENT; ++i) {
...@@ -636,4 +636,3 @@ int main(int argc, char ** argv) { ...@@ -636,4 +636,3 @@ int main(int argc, char ** argv) {
google::ParseCommandLineFlags(&argc, &argv, true); google::ParseCommandLineFlags(&argc, &argv, true);
return RUN_ALL_TESTS(); return RUN_ALL_TESTS();
} }
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