From 56e4be21c4b04bbf55e038ef479dcb6cbb8c0244 Mon Sep 17 00:00:00 2001 From: YM CHEN Date: Fri, 1 May 2015 11:21:58 +0800 Subject: [PATCH] fix namespace v2 Summary: Signed-off-by: Nicholas Ormrod Test Plan: fbconfig -r folly && fbmake runtests Reviewed By: yfeldblum@fb.com Subscribers: fugalh, folly-diffs@, jsedgwick, yfeldblum, chalfant FB internal diff: D2043151 Tasks: 6783581 --- folly/experimental/fibers/test/main.cpp | 2 +- folly/experimental/test/StringKeyedTest.cpp | 2 +- folly/futures/test/main.cpp | 3 ++- folly/io/test/ShutdownSocketSetTest.cpp | 2 +- folly/test/SingletonTest.cpp | 2 +- folly/test/StringBenchmark.cpp | 2 +- folly/wangle/service/ServiceTest.cpp | 2 +- 7 files changed, 8 insertions(+), 7 deletions(-) diff --git a/folly/experimental/fibers/test/main.cpp b/folly/experimental/fibers/test/main.cpp index 083af7e5..f9838672 100644 --- a/folly/experimental/fibers/test/main.cpp +++ b/folly/experimental/fibers/test/main.cpp @@ -23,7 +23,7 @@ namespace google { using namespace gflags; } int main(int argc, char** argv) { testing::InitGoogleTest(&argc, argv); - google::ParseCommandLineFlags(&argc, &argv, true); + gflags::ParseCommandLineFlags(&argc, &argv, true); auto rc = RUN_ALL_TESTS(); folly::runBenchmarksOnFlag(); diff --git a/folly/experimental/test/StringKeyedTest.cpp b/folly/experimental/test/StringKeyedTest.cpp index 782e6cd3..e36f81b2 100644 --- a/folly/experimental/test/StringKeyedTest.cpp +++ b/folly/experimental/test/StringKeyedTest.cpp @@ -503,7 +503,7 @@ int main(int argc, char **argv) { FLAGS_logtostderr = true; google::InitGoogleLogging(argv[0]); testing::InitGoogleTest(&argc, argv); - google::ParseCommandLineFlags(&argc, &argv, true); + gflags::ParseCommandLineFlags(&argc, &argv, true); return RUN_ALL_TESTS(); } diff --git a/folly/futures/test/main.cpp b/folly/futures/test/main.cpp index 457278f6..a596ae66 100644 --- a/folly/futures/test/main.cpp +++ b/folly/futures/test/main.cpp @@ -16,9 +16,10 @@ #include #include +#include int main(int argc, char** argv) { ::testing::InitGoogleTest(&argc, argv); - ::google::ParseCommandLineFlags(&argc, &argv, true); + ::gflags::ParseCommandLineFlags(&argc, &argv, true); return RUN_ALL_TESTS(); } diff --git a/folly/io/test/ShutdownSocketSetTest.cpp b/folly/io/test/ShutdownSocketSetTest.cpp index 76a598fa..bf19d729 100644 --- a/folly/io/test/ShutdownSocketSetTest.cpp +++ b/folly/io/test/ShutdownSocketSetTest.cpp @@ -226,6 +226,6 @@ TEST(ShutdownSocketSetTest, AbortiveKill) { int main(int argc, char *argv[]) { testing::InitGoogleTest(&argc, argv); - google::ParseCommandLineFlags(&argc, &argv, true); + gflags::ParseCommandLineFlags(&argc, &argv, true); return RUN_ALL_TESTS(); } diff --git a/folly/test/SingletonTest.cpp b/folly/test/SingletonTest.cpp index 19baebb2..f5d5983a 100644 --- a/folly/test/SingletonTest.cpp +++ b/folly/test/SingletonTest.cpp @@ -531,7 +531,7 @@ BENCHMARK_RELATIVE(FollySingletonWeak, n) { int main(int argc, char* argv[]) { testing::InitGoogleTest(&argc, argv); google::InitGoogleLogging(argv[0]); - google::ParseCommandLineFlags(&argc, &argv, true); + gflags::ParseCommandLineFlags(&argc, &argv, true); SingletonVault::singleton()->registrationComplete(); diff --git a/folly/test/StringBenchmark.cpp b/folly/test/StringBenchmark.cpp index 0241f8b1..c9c90d7d 100644 --- a/folly/test/StringBenchmark.cpp +++ b/folly/test/StringBenchmark.cpp @@ -48,7 +48,7 @@ BENCHMARK(folly_toLowerAscii, iters) { } int main(int argc, char** argv) { - google::ParseCommandLineFlags(&argc, &argv, true); + gflags::ParseCommandLineFlags(&argc, &argv, true); folly::runBenchmarks(); if (FLAGS_benchmark) { folly::runBenchmarks(); diff --git a/folly/wangle/service/ServiceTest.cpp b/folly/wangle/service/ServiceTest.cpp index 9d58e09a..297af72d 100644 --- a/folly/wangle/service/ServiceTest.cpp +++ b/folly/wangle/service/ServiceTest.cpp @@ -205,7 +205,7 @@ TEST(Wangle, SuperComplexFilterTest) { int main(int argc, char** argv) { testing::InitGoogleTest(&argc, argv); google::InitGoogleLogging(argv[0]); - google::ParseCommandLineFlags(&argc, &argv, true); + gflags::ParseCommandLineFlags(&argc, &argv, true); return RUN_ALL_TESTS(); } -- 2.34.1