Commit 9d7ab809 authored by Zonr Chang's avatar Zonr Chang Committed by Facebook Github Bot 2

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
parent f8908e51
...@@ -39,7 +39,7 @@ void init(int* argc, char*** argv, bool removeFlags) { ...@@ -39,7 +39,7 @@ void init(int* argc, char*** argv, bool removeFlags) {
google::InstallFailureSignalHandler(); google::InstallFailureSignalHandler();
#endif #endif
google::ParseCommandLineFlags(argc, argv, removeFlags); gflags::ParseCommandLineFlags(argc, argv, removeFlags);
auto programName = argc && argv && *argc > 0 ? (*argv)[0] : "unknown"; auto programName = argc && argv && *argc > 0 ? (*argv)[0] : "unknown";
google::InitGoogleLogging(programName); google::InitGoogleLogging(programName);
......
...@@ -397,7 +397,7 @@ BENCHMARK(fast_map_64) { ...@@ -397,7 +397,7 @@ BENCHMARK(fast_map_64) {
int main(int argc, char ** argv) { int main(int argc, char ** argv) {
testing::InitGoogleTest(&argc, argv); testing::InitGoogleTest(&argc, argv);
google::ParseCommandLineFlags(&argc, &argv, true); gflags::ParseCommandLineFlags(&argc, &argv, true);
int rv = RUN_ALL_TESTS(); int rv = RUN_ALL_TESTS();
folly::runBenchmarksOnFlag(); folly::runBenchmarksOnFlag();
return rv; return rv;
......
...@@ -151,7 +151,7 @@ void setup_rand_bench() { ...@@ -151,7 +151,7 @@ void setup_rand_bench() {
} }
int main(int argc, char** argv) { int main(int argc, char** argv) {
google::ParseCommandLineFlags(&argc, &argv, true); gflags::ParseCommandLineFlags(&argc, &argv, true);
setup_rand_bench(); setup_rand_bench();
runBenchmarks(); runBenchmarks();
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment