Swap a newly added include of gtest.h with portability/GTest.h
[folly.git] / folly / test / SharedMutexTest.cpp
index 43e6dd174d2f5de104173b0e31b51ae8346884f3..dc0274c860e5e576f8543bdee9898323396a2ea3 100644 (file)
@@ -20,7 +20,6 @@
 #include <thread>
 #include <vector>
 
-#include <gtest/gtest.h>
 #include <boost/optional.hpp>
 #include <boost/thread/shared_mutex.hpp>
 
@@ -29,6 +28,7 @@
 #include <folly/RWSpinLock.h>
 #include <folly/Random.h>
 #include <folly/portability/GFlags.h>
+#include <folly/portability/GTest.h>
 #include <folly/test/DeterministicSchedule.h>
 
 using namespace folly;
@@ -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