From 9d7ab80969fcc76e95103568daa249d00cd14790 Mon Sep 17 00:00:00 2001 From: Zonr Chang Date: Wed, 31 Aug 2016 11:37:58 -0700 Subject: [PATCH] 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 --- folly/init/Init.cpp | 2 +- folly/test/AtomicUnorderedMapTest.cpp | 2 +- folly/test/SparseByteSetBench.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/folly/init/Init.cpp b/folly/init/Init.cpp index f325ba34..ff53dd29 100644 --- 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 d90f126c..c9c42384 100644 --- 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 fc1c2793..49642396 100644 --- 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; -- 2.34.1