Consolidate namespace for using GFlags.

Summary:
Default namespace for GFlags has been changed from "google" to "gflags".

See: https://github.com/gflags/gflags/commit/d9d06b9.
Closes https://github.com/facebook/folly/pull/466

Reviewed By: yfeldblum

Differential Revision: D3787144

Pulled By: Orvid

fbshipit-source-id: db7bcaf4e2bcd46b022a48b17b50ef155570f296

diff --git a/folly/init/Init.cpp b/folly/init/Init.cpp
index f325ba3487fb53f14410b27a3f1370384a8a8bd9..ff53dd2999feff036ef04eb569e0fb664b94e3ad 100644 (file)
--- a/folly/init/Init.cpp
+++ b/folly/init/Init.cpp
@@ -39,7 +39,7 @@ void init(int* argc, char*** argv, bool removeFlags) {
   google::InstallFailureSignalHandler();
 #endif
 
-  google::ParseCommandLineFlags(argc, argv, removeFlags);
+  gflags::ParseCommandLineFlags(argc, argv, removeFlags);
 
   auto programName = argc && argv && *argc > 0 ? (*argv)[0] : "unknown";
   google::InitGoogleLogging(programName);

diff --git a/folly/test/AtomicUnorderedMapTest.cpp b/folly/test/AtomicUnorderedMapTest.cpp
index d90f126c465d37b0126f7a31aa304dadb789d490..c9c4238433786260838e31d54447d615643aa704 100644 (file)
--- a/folly/test/AtomicUnorderedMapTest.cpp
+++ b/folly/test/AtomicUnorderedMapTest.cpp
@@ -397,7 +397,7 @@ BENCHMARK(fast_map_64) {
 
 int main(int argc, char ** argv) {
   testing::InitGoogleTest(&argc, argv);
-  google::ParseCommandLineFlags(&argc, &argv, true);
+  gflags::ParseCommandLineFlags(&argc, &argv, true);
   int rv = RUN_ALL_TESTS();
   folly::runBenchmarksOnFlag();
   return rv;

diff --git a/folly/test/SparseByteSetBench.cpp b/folly/test/SparseByteSetBench.cpp
index fc1c27935d285ab52bb61072a2b31b8882d90161..49642396fb184baa780993fd2cd8f3436549b87d 100644 (file)
--- a/folly/test/SparseByteSetBench.cpp
+++ b/folly/test/SparseByteSetBench.cpp
@@ -151,7 +151,7 @@ void setup_rand_bench() {
 }
 
 int main(int argc, char** argv) {
-  google::ParseCommandLineFlags(&argc, &argv, true);
+  gflags::ParseCommandLineFlags(&argc, &argv, true);
   setup_rand_bench();
   runBenchmarks();
   return 0;