fix namespace v2

Summary: Signed-off-by: Nicholas Ormrod <njormrod@fb.com>

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

diff --git a/folly/experimental/fibers/test/main.cpp b/folly/experimental/fibers/test/main.cpp
index 083af7e5d12dbf5d2967cb89ba9f9d79edc924bd..f983867292edacf89a4381a7f86d263990613d62 100644 (file)
--- 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 782e6cd324a9bde294d2ddc34a7edc1434d0d67a..e36f81b22f1f70e160107035a433923743c61793 100644 (file)
--- 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 457278f6bdf538b64d512762b155ad410a0aa042..a596ae66b8013e3db0130f5d27e2f43de45219f7 100644 (file)
--- a/folly/futures/test/main.cpp
+++ b/folly/futures/test/main.cpp
@@ -16,9 +16,10 @@
 
 #include <gtest/gtest.h>
 #include <gflags/gflags.h>
+#include <folly/Portability.h>
 
 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 76a598fa38c75f20671904b016eaa7a58120b055..bf19d7298345b2ae03d5de31b57f67d3df5241d6 100644 (file)
--- 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 19baebb20cbe33452cc2835a7f20fa56c5e39501..f5d5983a728b1e35e8d17a3bbd4d858039e5b481 100644 (file)
--- 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 0241f8b1bfb5d8e4a61d07a2911d411954e1f3d6..c9c90d7dbee70892074359764e52dcf58d25f12f 100644 (file)
--- 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 9d58e09a4a66e6cc437072d4ffdba031673770ba..297af72d9c9f1473814115cc4565c5aa11c5f37b 100644 (file)
--- 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();
 }