gflags now likes namespace gflags, not google

Summary:
Use namespace gflags going forward, import namespace google into it if
backward.

Also added a few "checking for..." messages in autoconf.

Test Plan: fbconfig -r folly && fbmake runtests_opt, OSS build

Reviewed By: meyering@fb.com

Subscribers: fjargsto, ntv, jhj, lesha, kma, davejwatson

FB internal diff: D1420575

diff --git a/folly/AtomicBitSet.h b/folly/AtomicBitSet.h
index 48f1fd9494f2f7ec6b0dfef59ee28c35250df754..4b030ca9a9e2fed1b0da1b3db78b8749fc916549 100644 (file)
--- a/folly/AtomicBitSet.h
+++ b/folly/AtomicBitSet.h
@@ -25,6 +25,8 @@
 
 #include <boost/noncopyable.hpp>
 
+#include <folly/Portability.h>
+
 namespace folly {
 
 /**

diff --git a/folly/File.h b/folly/File.h
index 556088918984a034f500b3e39da1b28538b34068..2183609b97ac7b67831762de7aaeb0197e7b3de6 100644 (file)
--- a/folly/File.h
+++ b/folly/File.h
@@ -22,6 +22,8 @@
 #include <fcntl.h>
 #include <unistd.h>
 
+#include <folly/Portability.h>
+
 namespace folly {
 
 /**

diff --git a/folly/Portability.h b/folly/Portability.h
index 7f88cf25e4ee1c3e1112b8dd14f3c00c42632e89..51642a1c7649e9869c93604a3b3c030b0f1c71dc 100644 (file)
--- a/folly/Portability.h
+++ b/folly/Portability.h
@@ -233,4 +233,11 @@ typedef SSIZE_T ssize_t;
 # define __PRETTY_FUNCTION__ __FUNCSIG__
 #endif
 
+#if FOLLY_UNUSUAL_GFLAGS_NAMESPACE
+namespace FOLLY_GFLAGS_NAMESPACE { }
+namespace gflags {
+using namespace FOLLY_GFLAGS_NAMESPACE;
+}  // namespace gflags
+#endif
+
 #endif // FOLLY_PORTABILITY_H_

diff --git a/folly/build/GenerateFingerprintTables.cpp b/folly/build/GenerateFingerprintTables.cpp
index 3ebb99bcd2ae12657b436704ab22f9777c27508a..19d472c07580b3d89bfbaa71173a5d49b7ada112 100644 (file)
--- a/folly/build/GenerateFingerprintTables.cpp
+++ b/folly/build/GenerateFingerprintTables.cpp
@@ -119,7 +119,7 @@ void computeTables(FILE* file, const FingerprintPolynomial<DEG>& poly) {
 }  // namespace
 
 int main(int argc, char *argv[]) {
-  google::ParseCommandLineFlags(&argc, &argv, true);
+  gflags::ParseCommandLineFlags(&argc, &argv, true);
   google::InitGoogleLogging(argv[0]);
 
   std::string name = folly::format("{}/{}", FLAGS_install_dir,

diff --git a/folly/configure.ac b/folly/configure.ac
index b0db6b4d73852a02d760e0a8bd8853c1d8cd2c9c..d5465a2727fb7db4f4ad3da7f618548b0d2b0f1c 100644 (file)
--- a/folly/configure.ac
+++ b/folly/configure.ac
@@ -90,75 +90,160 @@ AC_CHECK_TYPE([__int128],
   [AC_DEFINE([HAVE_INT128_T], [1], [Define if __int128 exists])],
   [AC_DEFINE([HAVE_INT128_T], [0], [Define if __int128 does not exist])])
 AC_CHECK_TYPES([ptrdiff_t])
-AC_COMPILE_IFELSE(
-  [AC_LANG_SOURCE[
-    #pragma GCC diagnostic error "-Wattributes"
-    extern "C" void (*test_ifunc(void))() { return 0; }
-    void func() __attribute__((ifunc("test_ifunc")));]
-  ],
-  [AC_DEFINE([HAVE_IFUNC], [1], [Define to 1 if the compiler supports ifunc])],
-  [AC_DEFINE([HAVE_IFUNC], [0], [Define to 0 if the compiler doesn't support ifunc])]
-)
-AC_COMPILE_IFELSE(
-  [AC_LANG_SOURCE[class C { virtual void f() final {} virtual void g() {} };
-                  class D : public C { virtual void g() override {} };]],
-  [AC_DEFINE([FINAL], [final],
-             [Define to "final" if the compiler supports C++11 "final"])
-   AC_DEFINE([OVERRIDE], [override],
-             [Define to "override" if the compiler supports C++11 "override"])],
-  [AC_DEFINE([FINAL], [],
-             [Define to "final" if the compiler supports C++11 "final"])
-   AC_DEFINE([OVERRIDE], [],
-             [Define to "override" if the compiler supports C++11 "override"])]
-)
-
-AC_COMPILE_IFELSE(
-  [AC_LANG_SOURCE[
-    #include <thread>
-    #include <chrono>
-    void func() { std::this_thread::sleep_for(std::chrono::seconds(1)); }]],
-  [AC_DEFINE([HAVE_STD__THIS_THREAD__SLEEP_FOR], [1],
-             [Define to 1 if std::this_thread::sleep_for() is defined.])])
-
-AC_COMPILE_IFELSE(
-  [AC_LANG_SOURCE[
-    #include <cstring>
-    static constexpr int val = strlen("foo");]],
-  [AC_DEFINE([HAVE_CONSTEXPR_STRLEN], [1],
-             [Define to 1 if strlen(3) is constexpr.])])
-
-AC_COMPILE_IFELSE(
-  [AC_LANG_SOURCE[
-    #include <type_traits>
-    #if !_LIBCPP_VERSION
-    #error No libc++
-    #endif
-    void func() {}]
-  ],
-  [AC_DEFINE([USE_LIBCPP], [1], [Define to 1 if we're using libc++.])])
-
-AC_COMPILE_IFELSE(
-  [AC_LANG_SOURCE[
-    #include <type_traits>
-    const bool val = std::is_trivially_copyable<bool>::value;]
-  ],
-  [AC_DEFINE([HAVE_STD__IS_TRIVIALLY_COPYABLE], [1],
-             [Define to 1 if we have a usable std::is_trivially_copyable<T>
-              implementation.])])
+
+AC_CACHE_CHECK(
+  [for ifunc support],
+  [folly_cv_prog_cc_ifunc],
+  [AC_COMPILE_IFELSE(
+    [AC_LANG_SOURCE[
+      #pragma GCC diagnostic error "-Wattributes"
+      extern "C" void (*test_ifunc(void))() { return 0; }
+      void func() __attribute__((ifunc("test_ifunc")));]
+    ],
+    [folly_cv_prog_cc_ifunc=yes],
+    [folly_cv_prog_cc_ifunc=no])])
+
+if test "$folly_cv_prog_cc_ifunc" = "yes"; then
+  AC_DEFINE([HAVE_IFUNC], [1], [Define to 1 if the compiler supports ifunc])
+fi
+
+AC_CACHE_CHECK(
+  [for final and override support],
+  [folly_cv_c_final_override],
+  [AC_COMPILE_IFELSE(
+    [AC_LANG_SOURCE[class C { virtual void f() final {} virtual void g() {} };
+                    class D : public C { virtual void g() override {} };]],
+    [folly_cv_c_final_override=yes],
+    [folly_cv_c_final_override=no])])
+
+if test "$folly_cv_c_final_override" = "yes"; then
+  final_val=final
+  override_val=override
+else
+  final_val=
+  override_val=
+fi
+
+AC_DEFINE_UNQUOTED(
+  [FINAL], [$final_val],
+  [Define to "final" if the compiler supports C++11 "final"])
+AC_DEFINE_UNQUOTED(
+  [OVERRIDE], [$override_val],
+  [Define to "override" if the compiler supports C++11 "override"])
+
+AC_CACHE_CHECK(
+  [for std::this_thread::sleep_for],
+  [folly_cv_func_this_thread_sleep_for],
+  [AC_COMPILE_IFELSE(
+    [AC_LANG_SOURCE[
+      #include <thread>
+      #include <chrono>
+      void func() { std::this_thread::sleep_for(std::chrono::seconds(1)); }]],
+    [folly_cv_func_this_thread_sleep_for=yes],
+    [folly_cv_func_this_thread_sleep_for=no])])
+
+if test "$folly_cv_func_this_thread_sleep_for" = yes; then
+    AC_DEFINE([HAVE_STD__THIS_THREAD__SLEEP_FOR], [1],
+              [Define to 1 if std::this_thread::sleep_for() is defined.])
+fi
+
+AC_CACHE_CHECK(
+  [for constexpr strlen],
+  [folly_cv_func_constexpr_strlen],
+  [AC_COMPILE_IFELSE(
+    [AC_LANG_SOURCE[
+      #include <cstring>
+      static constexpr int val = strlen("foo");]],
+    [folly_cv_func_constexpr_strlen=yes],
+    [folly_cv_func_constexpr_strlen=no])])
+
+if test "$folly_cv_func_constexpr_strlen" = yes; then
+    AC_DEFINE([HAVE_CONSTEXPR_STRLEN], [1],
+              [Define to 1 if strlen(3) is constexpr.])
+fi
+
+AC_CACHE_CHECK(
+  [for libc++],
+  [folly_cv_lib_libcpp],
+  [AC_COMPILE_IFELSE(
+    [AC_LANG_SOURCE[
+      #include <type_traits>
+      #if !_LIBCPP_VERSION
+      #error No libc++
+      #endif
+      void func() {}]
+    ],
+    [folly_cv_lib_libcpp=yes],
+    [folly_cv_lib_libcpp=no])])
+
+if test "$folly_cv_lib_libcpp" = yes; then
+  AC_DEFINE([USE_LIBCPP], [1], [Define to 1 if we're using libc++.])
+fi
+
+AC_CACHE_CHECK(
+  [for usable std::is_trivially_copyable],
+  [folly_cv_decl_std_is_trivially_copyable],
+  [AC_COMPILE_IFELSE(
+    [AC_LANG_SOURCE[
+      #include <type_traits>
+      const bool val = std::is_trivially_copyable<bool>::value;]
+    ],
+    [folly_cv_decl_std_is_trivially_copyable=yes],
+    [folly_cv_decl_std_is_trivially_copyable=no])])
+
+if test "$folly_cv_decl_std_is_trivially_copyable" = yes; then
+  AC_DEFINE([HAVE_STD__IS_TRIVIALLY_COPYABLE], [1],
+            [Define to 1 if we have a usable std::is_trivially_copyable<T>
+             implementation.])
+fi
+
+AC_CACHE_CHECK(
+  [gflags namespace],
+  [folly_cv_decl_gflags_namespace],
+  [AC_COMPILE_IFELSE(
+    [AC_LANG_SOURCE[
+      #include <gflags/gflags.h>
+      void foo() { gflags::GetArgv(); }]
+    ],
+    [folly_cv_decl_gflags_namespace=gflags],
+    [AC_COMPILE_IFELSE(
+      [AC_LANG_SOURCE[
+        #include <gflags/gflags.h>
+        void foo() { google::GetArgv(); }]
+      ],
+      [folly_cv_decl_gflags_namespace=google],
+      [folly_cv_decl_gflags_namespace=error])])])
+
+if test "$folly_cv_decl_gflags_namespace" = error; then
+  AC_MSG_ERROR([Cannot determine gflags namespace])
+else
+  AC_DEFINE_UNQUOTED(
+    [GFLAGS_NAMESPACE], [$folly_cv_decl_gflags_namespace],
+    [Define to gflags namespace (usually "google" or "gflags")])
+  if test "$folly_cv_decl_gflags_namespace" != gflags; then
+     AC_DEFINE([UNUSUAL_GFLAGS_NAMESPACE], [1],
+               [Define to 1 if the gflags namespace is not "gflags"])
+  fi
+fi
 
 # Figure out if we support weak symbols. If not, we will link in some null
 # stubs for functions that would otherwise be weak.
-AC_LINK_IFELSE(
-  [AC_LANG_SOURCE[
-    extern "C" void configure_link_extern_weak_test() __attribute__((weak));
-    int main(int argc, char** argv) {
-        return configure_link_extern_weak_test == nullptr;
-    }]
-  ],
-  [
-    ac_have_weak_symbols="yes"
-    AC_DEFINE([HAVE_WEAK_SYMBOLS], [1],
-              [Define to 1 if the linker supports weak symbols.])])
+AC_CACHE_CHECK(
+  [for weak symbol support],
+  [folly_cv_prog_cc_weak_symbols],
+  [AC_LINK_IFELSE(
+    [AC_LANG_SOURCE[
+      extern "C" void configure_link_extern_weak_test() __attribute__((weak));
+      int main(int argc, char** argv) {
+          return configure_link_extern_weak_test == nullptr;
+      }]],
+    [folly_cv_prog_cc_weak_symbols="yes"],
+    [folly_cv_prog_cc_weak_symbols="no"])])
+
+if test "$folly_cv_prog_cc_weak_symbols" = yes; then
+  AC_DEFINE([HAVE_WEAK_SYMBOLS], [1],
+            [Define to 1 if the linker supports weak symbols.])
+fi
 
 AC_SEARCH_LIBS([cplus_demangle_v3_callback], [iberty_pic iberty])
 if test "$ac_cv_search_cplus_demangle_v3_callback" != "no" ; then
@@ -210,7 +295,8 @@ AC_SUBST([AM_LDFLAGS])
 AM_CONDITIONAL([HAVE_STD_THREAD], [test "$ac_cv_header_features" = "yes"])
 AM_CONDITIONAL([HAVE_X86_64], [test "$build_cpu" = "x86_64"])
 AM_CONDITIONAL([HAVE_LINUX], [test "$build_os" == "linux-gnu"])
-AM_CONDITIONAL([HAVE_WEAK_SYMBOLS], [test "$ac_have_weak_symbols" = "yes"])
+AM_CONDITIONAL([HAVE_WEAK_SYMBOLS],
+               [test "$folly_cv_prog_cc_weak_symbols" = "yes"])
 AM_CONDITIONAL([HAVE_BITS_FUNCTEXCEPT], [test "$ac_cv_header_bits_functexcept" = "yes"])
 
 # Output

diff --git a/folly/experimental/exception_tracer/ExceptionTracerBenchmark.cpp b/folly/experimental/exception_tracer/ExceptionTracerBenchmark.cpp
index a9c80bf04cd208bbec2c780d95ac0e1dc66ec43c..c04a3e5c911961fca5dc80820e2c483ac2aa9c66 100644 (file)
--- a/folly/experimental/exception_tracer/ExceptionTracerBenchmark.cpp
+++ b/folly/experimental/exception_tracer/ExceptionTracerBenchmark.cpp
@@ -55,7 +55,7 @@ BENCHMARK(ExceptionTracer, iters) {
 }
 
 int main(int argc, char* argv[]) {
-  google::ParseCommandLineFlags(&argc, &argv, true);
+  gflags::ParseCommandLineFlags(&argc, &argv, true);
   google::InitGoogleLogging(argv[0]);
   folly::runBenchmarks();
   return 0;

diff --git a/folly/experimental/io/HugePageUtil.cpp b/folly/experimental/io/HugePageUtil.cpp
index b37bab1ebdda2bf87705f622bbb231a52f9efc6a..0dccb8ac70c9132c6975b813deae3b4c1aac21cb 100644 (file)
--- a/folly/experimental/io/HugePageUtil.cpp
+++ b/folly/experimental/io/HugePageUtil.cpp
@@ -74,7 +74,7 @@ void list() {
 
 
 int main(int argc, char *argv[]) {
-  google::ParseCommandLineFlags(&argc, &argv, true);
+  gflags::ParseCommandLineFlags(&argc, &argv, true);
   if (FLAGS_cp) {
     if (argc != 3) usage(argv[0]);
     copy(argv[1], argv[2]);

diff --git a/folly/experimental/symbolizer/ElfUtil.cpp b/folly/experimental/symbolizer/ElfUtil.cpp
index 6f6003dbb1793ae43af18c49fdf81be345eec70e..a49f661a4e8ad99c43197adfcb6c0284eac66618 100644 (file)
--- a/folly/experimental/symbolizer/ElfUtil.cpp
+++ b/folly/experimental/symbolizer/ElfUtil.cpp
@@ -26,7 +26,7 @@ using namespace folly;
 using namespace folly::symbolizer;
 
 int main(int argc, char *argv[]) {
-  google::ParseCommandLineFlags(&argc, &argv, true);
+  gflags::ParseCommandLineFlags(&argc, &argv, true);
   CHECK_GE(argc, 2);
 
   ElfFile elf(argv[1]);

diff --git a/folly/experimental/symbolizer/test/ElfTests.cpp b/folly/experimental/symbolizer/test/ElfTests.cpp
index 258ad992c40009d789e2696425401d5a6f4226ea..5350d4df80c95cd9f70b0f718be13baae8780b2f 100644 (file)
--- a/folly/experimental/symbolizer/test/ElfTests.cpp
+++ b/folly/experimental/symbolizer/test/ElfTests.cpp
@@ -59,7 +59,7 @@ TEST_F(ElfTest, PointerValue) {
 
 int main(int argc, char** argv) {
   testing::InitGoogleTest(&argc, argv);
-  google::ParseCommandLineFlags(&argc, &argv, true);
+  gflags::ParseCommandLineFlags(&argc, &argv, true);
   ElfTest::binaryPath = argv[0];
   return RUN_ALL_TESTS();
 }

diff --git a/folly/experimental/symbolizer/test/StackTraceTest.cpp b/folly/experimental/symbolizer/test/StackTraceTest.cpp
index 8123997a66716dfe44fc68b596b944b0c4d33ac8..601bb0616022b2aaea3c4f70f455765dd98470ec 100644 (file)
--- a/folly/experimental/symbolizer/test/StackTraceTest.cpp
+++ b/folly/experimental/symbolizer/test/StackTraceTest.cpp
@@ -90,7 +90,7 @@ TEST(StackTraceTest, Signal) {
 
 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/experimental/test/BitsBenchmark.cpp b/folly/experimental/test/BitsBenchmark.cpp
index 454fddbd38533b2d3c86868758472bc7e4df972e..08230eac31b08f0c2b6cadec1834058e440f6bd4 100644 (file)
--- a/folly/experimental/test/BitsBenchmark.cpp
+++ b/folly/experimental/test/BitsBenchmark.cpp
@@ -111,7 +111,7 @@ benchmarkGet(i64)                                 85.78%     8.53ns  117.16M
 #endif
 
 int main(int argc, char *argv[]) {
-  google::ParseCommandLineFlags(&argc, &argv, true);
+  gflags::ParseCommandLineFlags(&argc, &argv, true);
   folly::runBenchmarks();
   return sum.load();
 }

diff --git a/folly/experimental/test/BitsTest.cpp b/folly/experimental/test/BitsTest.cpp
index 9ac5bc82ae03e0df008c65dda1bbc57a209e1df8..ba4d0ab9beef0d611d1bcfb8ab7764d4199a328a 100644 (file)
--- a/folly/experimental/test/BitsTest.cpp
+++ b/folly/experimental/test/BitsTest.cpp
@@ -310,7 +310,7 @@ TEST(Bits, ConcatenationAligned) {
 
 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/experimental/test/EliasFanoCodingTest.cpp b/folly/experimental/test/EliasFanoCodingTest.cpp
index 801923593260c6af9c9fbb3415ec2cd56b98e438..6e45e7b0593f4d500e5bf696437dda7f8b787b1b 100644 (file)
--- a/folly/experimental/test/EliasFanoCodingTest.cpp
+++ b/folly/experimental/test/EliasFanoCodingTest.cpp
@@ -128,7 +128,7 @@ BENCHMARK(SkipTo1000_SkipQ128_1M) {
 
 int main(int argc, char** argv) {
   testing::InitGoogleTest(&argc, argv);
-  google::ParseCommandLineFlags(&argc, &argv, true);
+  gflags::ParseCommandLineFlags(&argc, &argv, true);
 
   auto ret = RUN_ALL_TESTS();
   if (ret == 0 && FLAGS_benchmark) {

diff --git a/folly/experimental/test/EventCountTest.cpp b/folly/experimental/test/EventCountTest.cpp
index 077b4c717c80100a23a156812d9892335d7622f6..1c65f5fc97b2375ec909a5d6b966186187d8d7d3 100644 (file)
--- a/folly/experimental/test/EventCountTest.cpp
+++ b/folly/experimental/test/EventCountTest.cpp
@@ -127,7 +127,7 @@ TEST(EventCount, Simple) {
 
 int main(int argc, char *argv[]) {
   testing::InitGoogleTest(&argc, argv);
-  google::ParseCommandLineFlags(&argc, &argv, true);
+  gflags::ParseCommandLineFlags(&argc, &argv, true);
   auto ret = RUN_ALL_TESTS();
   if (!ret) {
     folly::runBenchmarksOnFlag();

diff --git a/folly/experimental/test/TestUtilTest.cpp b/folly/experimental/test/TestUtilTest.cpp
index 8e458532d1b6538b7b1b804aacc5a3ba0600087f..4bf29526564027172439c8b6a80af73bf3759985 100644 (file)
--- a/folly/experimental/test/TestUtilTest.cpp
+++ b/folly/experimental/test/TestUtilTest.cpp
@@ -102,7 +102,7 @@ TEST(TemporaryDirectory, DeleteOnDestruction) {
 
 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/gen/test/BaseBenchmark.cpp b/folly/gen/test/BaseBenchmark.cpp
index 5ca1fbd9dc7ac606a7e2d3545c3efa30b3357854..6899eb31faaf09f568d4f23c72f9d88c5dc1b01d 100644 (file)
--- a/folly/gen/test/BaseBenchmark.cpp
+++ b/folly/gen/test/BaseBenchmark.cpp
@@ -338,7 +338,7 @@ BENCHMARK(Sample, iters) {
 // ============================================================================
 
 int main(int argc, char *argv[]) {
-  google::ParseCommandLineFlags(&argc, &argv, true);
+  gflags::ParseCommandLineFlags(&argc, &argv, true);
   folly::runBenchmarks();
   return 0;
 }

diff --git a/folly/gen/test/BaseTest.cpp b/folly/gen/test/BaseTest.cpp
index be056b5bd69575a44cd55ce36fefc46acbf72e10..7d34a21db1b2fa35acc88baed2992bdb335e4267 100644 (file)
--- a/folly/gen/test/BaseTest.cpp
+++ b/folly/gen/test/BaseTest.cpp
@@ -1029,6 +1029,6 @@ TEST(Gen, BatchMove) {
 
 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/gen/test/CombineTest.cpp b/folly/gen/test/CombineTest.cpp
index ba231e579018871c6ad8add85bdb99a582f6969f..a28f45f1bb40016a6b9f127e57b4178c4454fa3e 100644 (file)
--- a/folly/gen/test/CombineTest.cpp
+++ b/folly/gen/test/CombineTest.cpp
@@ -162,6 +162,6 @@ TEST(CombineGen, TupleFlatten) {
 
 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/gen/test/FileBenchmark.cpp b/folly/gen/test/FileBenchmark.cpp
index 0f4f5b4c6130c12524f1c56c1727cee9397f3b5c..61e7220e0ab2f27def9129b3d02318a5c648d5b5 100644 (file)
--- a/folly/gen/test/FileBenchmark.cpp
+++ b/folly/gen/test/FileBenchmark.cpp
@@ -64,7 +64,7 @@ BENCHMARK(ByLine_Pipes, iters) {
 // ============================================================================
 
 int main(int argc, char *argv[]) {
-  google::ParseCommandLineFlags(&argc, &argv, true);
+  gflags::ParseCommandLineFlags(&argc, &argv, true);
   folly::runBenchmarks();
   return 0;
 }

diff --git a/folly/gen/test/FileTest.cpp b/folly/gen/test/FileTest.cpp
index 172c6f98deecd27f00543ba0414658334ecadda7..2e0a3a84a11cfd3c66d515a897254da7bfd30540 100644 (file)
--- a/folly/gen/test/FileTest.cpp
+++ b/folly/gen/test/FileTest.cpp
@@ -75,6 +75,6 @@ INSTANTIATE_TEST_CASE_P(
     ::testing::Values(0, 1, 2, 4, 8, 64, 4096));
 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/gen/test/ParallelBenchmark.cpp b/folly/gen/test/ParallelBenchmark.cpp
index 886eb4e759dc47027245944c5ecaa197a3fae9eb..3d312906a18b3a338ff54d45ebc0123a7bdeb6bb 100644 (file)
--- a/folly/gen/test/ParallelBenchmark.cpp
+++ b/folly/gen/test/ParallelBenchmark.cpp
@@ -173,7 +173,7 @@ seq(1, fibs) | parallel(map([](int) { return fi 1698.07%    87.96ms    11.37
 ============================================================================
 #endif
 int main(int argc, char *argv[]) {
-  google::ParseCommandLineFlags(&argc, &argv, true);
+  gflags::ParseCommandLineFlags(&argc, &argv, true);
   folly::runBenchmarks();
   return 0;
 }

diff --git a/folly/gen/test/ParallelMapBenchmark.cpp b/folly/gen/test/ParallelMapBenchmark.cpp
index 389269ded0317d4e17efe24359bf25ab9ce05ed9..a0b466c2fe83294d42b2572d08a811eb32691ab4 100644 (file)
--- a/folly/gen/test/ParallelMapBenchmark.cpp
+++ b/folly/gen/test/ParallelMapBenchmark.cpp
@@ -85,7 +85,7 @@ BENCHMARK_RELATIVE(FibSumThreads, n) {
 */
 
 int main(int argc, char *argv[]) {
-  google::ParseCommandLineFlags(&argc, &argv, true);
+  gflags::ParseCommandLineFlags(&argc, &argv, true);
   folly::runBenchmarks();
   return 0;
 }

diff --git a/folly/gen/test/ParallelMapTest.cpp b/folly/gen/test/ParallelMapTest.cpp
index 15c0b4540ad4cc82a46503f9fa00d6d81313921a..d18064ad41a893ee49b7bbf483134e341b277013 100644 (file)
--- a/folly/gen/test/ParallelMapTest.cpp
+++ b/folly/gen/test/ParallelMapTest.cpp
@@ -140,6 +140,6 @@ TEST(Pmap, Rvalues) {
 
 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/gen/test/ParallelTest.cpp b/folly/gen/test/ParallelTest.cpp
index 585e325ead2188dd5e9e95dab6990c006cedb1fe..f40ab24ad3e1d1aee487d6871ffb20ab1d5d6ef3 100644 (file)
--- a/folly/gen/test/ParallelTest.cpp
+++ b/folly/gen/test/ParallelTest.cpp
@@ -104,6 +104,6 @@ TEST(ParallelTest, PSum) {
 
 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/gen/test/StringBenchmark.cpp b/folly/gen/test/StringBenchmark.cpp
index 7f2e2f0bfa5ef11144ead44ebb54fe4a63c922cf..fcc20d12fb496e496bcd3123da3052c775463eaf 100644 (file)
--- a/folly/gen/test/StringBenchmark.cpp
+++ b/folly/gen/test/StringBenchmark.cpp
@@ -322,7 +322,7 @@ BENCHMARK_RELATIVE(Records_VectorString, iters) {
 // ============================================================================
 
 int main(int argc, char *argv[]) {
-  google::ParseCommandLineFlags(&argc, &argv, true);
+  gflags::ParseCommandLineFlags(&argc, &argv, true);
   initStringResplitterBenchmark();
   runBenchmarks();
   return 0;

diff --git a/folly/gen/test/StringTest.cpp b/folly/gen/test/StringTest.cpp
index 71acab88418bdd696e96d5d1aa7eb15374056033..96d61a0086082c7d6da53517af413f9f81ea6979 100644 (file)
--- a/folly/gen/test/StringTest.cpp
+++ b/folly/gen/test/StringTest.cpp
@@ -304,6 +304,6 @@ TEST(StringGen, Unsplit) {
 
 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/CompressionTest.cpp b/folly/io/test/CompressionTest.cpp
index 4968f07ec0a13f560c8ad5f68ac0aeb2e50734e0..42487012d0ba9d01eb20aca9ad5d664e5fbacf74 100644 (file)
--- a/folly/io/test/CompressionTest.cpp
+++ b/folly/io/test/CompressionTest.cpp
@@ -247,7 +247,7 @@ INSTANTIATE_TEST_CASE_P(
 
 int main(int argc, char *argv[]) {
   testing::InitGoogleTest(&argc, argv);
-  google::ParseCommandLineFlags(&argc, &argv, true);
+  gflags::ParseCommandLineFlags(&argc, &argv, true);
 
   auto ret = RUN_ALL_TESTS();
   if (!ret) {

diff --git a/folly/io/test/IOBufCursorTest.cpp b/folly/io/test/IOBufCursorTest.cpp
index 824df93e8fdb241e079cba5690bc33e724fc4e0c..3ec3055eacab4be8444408fff2b3c4ce5da9cbfb 100644 (file)
--- a/folly/io/test/IOBufCursorTest.cpp
+++ b/folly/io/test/IOBufCursorTest.cpp
@@ -643,7 +643,7 @@ BENCHMARK(skipBenchmark, iters) {
 
 int main(int argc, char** argv) {
   testing::InitGoogleTest(&argc, argv);
-  google::ParseCommandLineFlags(&argc, &argv, true);
+  gflags::ParseCommandLineFlags(&argc, &argv, true);
 
   auto ret = RUN_ALL_TESTS();
 

diff --git a/folly/io/test/IOBufQueueTest.cpp b/folly/io/test/IOBufQueueTest.cpp
index 8e905171d5dbdb2cc7142580530d8141632a1989..e1051a1e88177c93ae3999606943b7921f3bdfae 100644 (file)
--- a/folly/io/test/IOBufQueueTest.cpp
+++ b/folly/io/test/IOBufQueueTest.cpp
@@ -380,7 +380,7 @@ TEST(IOBufQueue, PopFirst) {
 
 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/IOBufTest.cpp b/folly/io/test/IOBufTest.cpp
index 283bee7d5e677675de09eb9c786d000095124c1d..71804bb57436f19d19739f36b473c3bdc28b5ea4 100644 (file)
--- a/folly/io/test/IOBufTest.cpp
+++ b/folly/io/test/IOBufTest.cpp
@@ -1069,7 +1069,7 @@ TEST(IOBuf, HashAndEqual) {
 
 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/NetworkBenchmark.cpp b/folly/io/test/NetworkBenchmark.cpp
index 45077342c53ef2b9a8f529caf12e476e6b1680a5..1178fc8c7fbb2dc8850097fe9cbb3dbf6eacfce4 100644 (file)
--- a/folly/io/test/NetworkBenchmark.cpp
+++ b/folly/io/test/NetworkBenchmark.cpp
@@ -150,7 +150,7 @@ chainBenchmark                         100000  118.6 ms  1.186 us  823.2 k
 poolBenchmark                          100000   32.2 ms    322 ns  2.962 M
 */
 int main(int argc, char** argv) {
-  google::ParseCommandLineFlags(&argc, &argv, true);
+  gflags::ParseCommandLineFlags(&argc, &argv, true);
 
   setNumbers(10, 10);
   folly::runBenchmarks();

diff --git a/folly/io/test/RecordIOTest.cpp b/folly/io/test/RecordIOTest.cpp
index f4d20bad758d3e40985e571e19e41967436c81e0..a9d0624483423dbcf7108c10388c0be815c6556b 100644 (file)
--- a/folly/io/test/RecordIOTest.cpp
+++ b/folly/io/test/RecordIOTest.cpp
@@ -267,6 +267,6 @@ TEST(RecordIOTest, Randomized) {
 
 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/ArenaTest.cpp b/folly/test/ArenaTest.cpp
index feda95ca7fdee6abf8f268bd3683b7cbaf98a33f..4d77e207afa9e4c5aab463fb4ea5f71c45d8df30 100644 (file)
--- a/folly/test/ArenaTest.cpp
+++ b/folly/test/ArenaTest.cpp
@@ -157,7 +157,7 @@ TEST(Arena, SizeLimit) {
 
 int main(int argc, char *argv[]) {
   testing::InitGoogleTest(&argc, argv);
-  google::ParseCommandLineFlags(&argc, &argv, true);
+  gflags::ParseCommandLineFlags(&argc, &argv, true);
   auto ret = RUN_ALL_TESTS();
   return ret;
 }

diff --git a/folly/test/AsciiCaseInsensitiveBenchmark.cpp b/folly/test/AsciiCaseInsensitiveBenchmark.cpp
index 610dba67e43e7b7d1b503706f952b8db4794ad3d..20aee3f528af6306622ee2b9916b9ec83282dbc4 100644 (file)
--- a/folly/test/AsciiCaseInsensitiveBenchmark.cpp
+++ b/folly/test/AsciiCaseInsensitiveBenchmark.cpp
@@ -111,7 +111,7 @@ BENCHMARK(CurrentCaseInsensitiveCheck, 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/test/AsciiCaseInsensitiveTest.cpp b/folly/test/AsciiCaseInsensitiveTest.cpp
index 373998c42430f105318be278ee5170d749e6ac76..3d00e50d53eb08a33757f0cd4c7e0aa4094be59c 100644 (file)
--- a/folly/test/AsciiCaseInsensitiveTest.cpp
+++ b/folly/test/AsciiCaseInsensitiveTest.cpp
@@ -32,6 +32,6 @@ TEST(CaseInsensitiveMatch, CompareWithLegacy) {
 
 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/AtomicBitSetTest.cpp b/folly/test/AtomicBitSetTest.cpp
index 11032acdae3c1be8486e168aa7d0777f5c6ff6c1..3a0a0efc53b9e8333a35c51a294c20cb6010712a 100644 (file)
--- a/folly/test/AtomicBitSetTest.cpp
+++ b/folly/test/AtomicBitSetTest.cpp
@@ -56,7 +56,7 @@ TEST(AtomicBitSet, Simple) {
 
 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/AtomicHashMapTest.cpp b/folly/test/AtomicHashMapTest.cpp
index 449b5622da646c9584489c6449b7c9b7b0f00d5a..a91f571fe980a94e6a44752e2aa0c2406bcc74f8 100644 (file)
--- a/folly/test/AtomicHashMapTest.cpp
+++ b/folly/test/AtomicHashMapTest.cpp
@@ -773,15 +773,15 @@ void benchmarkSetup() {
   string numIters = folly::to<string>(
     std::min(1000000, int(FLAGS_numBMElements)));
 
-  google::SetCommandLineOptionWithMode(
-    "bm_max_iters", numIters.c_str(), google::SET_FLAG_IF_DEFAULT
+  gflags::SetCommandLineOptionWithMode(
+    "bm_max_iters", numIters.c_str(), gflags::SET_FLAG_IF_DEFAULT
   );
-  google::SetCommandLineOptionWithMode(
-    "bm_min_iters", numIters.c_str(), google::SET_FLAG_IF_DEFAULT
+  gflags::SetCommandLineOptionWithMode(
+    "bm_min_iters", numIters.c_str(), gflags::SET_FLAG_IF_DEFAULT
   );
   string numCoresStr = folly::to<string>(numCores);
-  google::SetCommandLineOptionWithMode(
-    "numThreads", numCoresStr.c_str(), google::SET_FLAG_IF_DEFAULT
+  gflags::SetCommandLineOptionWithMode(
+    "numThreads", numCoresStr.c_str(), gflags::SET_FLAG_IF_DEFAULT
   );
 
   std::cout << "\nRunning AHM benchmarks on machine with " << numCores
@@ -793,7 +793,7 @@ void benchmarkSetup() {
 
 int main(int argc, char** argv) {
   testing::InitGoogleTest(&argc, argv);
-  google::ParseCommandLineFlags(&argc, &argv, true);
+  gflags::ParseCommandLineFlags(&argc, &argv, true);
   auto ret = RUN_ALL_TESTS();
   if (!ret && FLAGS_benchmark) {
     benchmarkSetup();

diff --git a/folly/test/AtomicStructTest.cpp b/folly/test/AtomicStructTest.cpp
index e142834c8d68893d4c8348aca0e4826771f2c125..43757a35dcd0083d74d661782ac26d932b521f49 100644 (file)
--- a/folly/test/AtomicStructTest.cpp
+++ b/folly/test/AtomicStructTest.cpp
@@ -71,6 +71,6 @@ TEST(AtomicStruct, size_selection) {
 
 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/BatonTest.cpp b/folly/test/BatonTest.cpp
index e2c5cf13e322e0eec1c98a662c8fad596df881ce..ede45327096babb4baa01f1e2da5bb32ae3b93bf 100644 (file)
--- a/folly/test/BatonTest.cpp
+++ b/folly/test/BatonTest.cpp
@@ -90,7 +90,7 @@ BENCHMARK(posix_sem_pingpong, iters) {
 
 int main(int argc, char** argv) {
   testing::InitGoogleTest(&argc, argv);
-  google::ParseCommandLineFlags(&argc, &argv, true);
+  gflags::ParseCommandLineFlags(&argc, &argv, true);
 
   auto rv = RUN_ALL_TESTS();
   if (!rv && FLAGS_benchmark) {

diff --git a/folly/test/BenchmarkTest.cpp b/folly/test/BenchmarkTest.cpp
index a039f02d127609c6ba20c767906f240c5dcad8ae..fed53ba1bc626ec1df4c24219d5bbfc79f3cbd10 100644 (file)
--- a/folly/test/BenchmarkTest.cpp
+++ b/folly/test/BenchmarkTest.cpp
@@ -129,7 +129,7 @@ BENCHMARK_PARAM_MULTI(paramMulti, 5);
 BENCHMARK_RELATIVE_PARAM_MULTI(paramMultiRel, 5);
 
 int main(int argc, char** argv) {
-  google::ParseCommandLineFlags(&argc, &argv, true);
+  gflags::ParseCommandLineFlags(&argc, &argv, true);
   runBenchmarks();
   runBenchmarksOnFlag();
 }

diff --git a/folly/test/BitIteratorTest.cpp b/folly/test/BitIteratorTest.cpp
index 478cd6a84505ccb424f9a33ea369892293af2911..002a19e00ed4e864fa753e60c6ac3a4af83723d0 100644 (file)
--- a/folly/test/BitIteratorTest.cpp
+++ b/folly/test/BitIteratorTest.cpp
@@ -178,7 +178,7 @@ runRealFFSTest                             19  2.011 s   105.9 ms  9.447
 
 int main(int argc, char** argv) {
   testing::InitGoogleTest(&argc, argv);
-  google::ParseCommandLineFlags(&argc, &argv, true);
+  gflags::ParseCommandLineFlags(&argc, &argv, true);
   auto ret = RUN_ALL_TESTS();
   if (!ret && FLAGS_benchmark) {
     folly::runBenchmarks();

diff --git a/folly/test/BitsTest.cpp b/folly/test/BitsTest.cpp
index ba47aaf5c3a7ff77672ada7649cf0251d8c96aa7..1bb9c1725d93ed8a24394abcdea1cbd1058cbdea 100644 (file)
--- a/folly/test/BitsTest.cpp
+++ b/folly/test/BitsTest.cpp
@@ -164,7 +164,7 @@ TEST(Bits, popcount) {
 
 int main(int argc, char** argv) {
   testing::InitGoogleTest(&argc, argv);
-  google::ParseCommandLineFlags(&argc, &argv, true);
+  gflags::ParseCommandLineFlags(&argc, &argv, true);
   auto ret = RUN_ALL_TESTS();
   if (!ret && FLAGS_benchmark) {
     folly::runBenchmarks();

diff --git a/folly/test/CacheLocalityTest.cpp b/folly/test/CacheLocalityTest.cpp
index 0b5322fe12f07fee31c4b022795889c3f8da30bd..b3f7207d7ea7bb3b933535e9dfef9f1572c7f52b 100644 (file)
--- a/folly/test/CacheLocalityTest.cpp
+++ b/folly/test/CacheLocalityTest.cpp
@@ -696,7 +696,7 @@ BENCHMARK_NAMED_PARAM(atomicIncrBaseline, local_incr_1000_work, 1000)
 
 int main(int argc, char** argv) {
   testing::InitGoogleTest(&argc, argv);
-  google::ParseCommandLineFlags(&argc, &argv, true);
+  gflags::ParseCommandLineFlags(&argc, &argv, true);
   auto ret = RUN_ALL_TESTS();
   if (!ret && FLAGS_benchmark) {
     folly::runBenchmarks();

diff --git a/folly/test/ChecksumTest.cpp b/folly/test/ChecksumTest.cpp
index e563d3f91dc117b3e7926e9ef26874d0ccd37265..316456cffd4c78814f5ab02d53aeabcec5c8bcbb 100644 (file)
--- a/folly/test/ChecksumTest.cpp
+++ b/folly/test/ChecksumTest.cpp
@@ -180,7 +180,7 @@ BENCHMARK(crc32c_software_512KB_block, iters) {
 
 int main(int argc, char** argv) {
   testing::InitGoogleTest(&argc, argv);
-  google::ParseCommandLineFlags(&argc, &argv, true);
+  gflags::ParseCommandLineFlags(&argc, &argv, true);
 
   // Populate a buffer with a deterministic pattern
   // on which to compute checksums

diff --git a/folly/test/ConcurrentSkipListBenchmark.cpp b/folly/test/ConcurrentSkipListBenchmark.cpp
index 2fe525791d8d17e09e00a479d924ac9c89bde659..951079b5120afcd7c39f92eef37c0d8994a59278 100644 (file)
--- a/folly/test/ConcurrentSkipListBenchmark.cpp
+++ b/folly/test/ConcurrentSkipListBenchmark.cpp
@@ -599,7 +599,7 @@ BENCHMARK_DRAW_LINE();
 
 int main(int argc, char** argv) {
   google::InitGoogleLogging(argv[0]);
-  google::ParseCommandLineFlags(&argc, &argv, true);
+  gflags::ParseCommandLineFlags(&argc, &argv, true);
 
   initData();
   runBenchmarks();

diff --git a/folly/test/ConcurrentSkipListTest.cpp b/folly/test/ConcurrentSkipListTest.cpp
index 02ce733b0b310875fe8a6c655dd2c80f17631591..f0139648e734328933d58400b5a9fd699e9ea50b 100644 (file)
--- a/folly/test/ConcurrentSkipListTest.cpp
+++ b/folly/test/ConcurrentSkipListTest.cpp
@@ -389,7 +389,7 @@ TEST(ConcurrentSkipList, ConcurrentAccess) {
 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();
 }

diff --git a/folly/test/ConvTest.cpp b/folly/test/ConvTest.cpp
index f692af7bf527c8497f6a1eb6d78c7d931741a1d2..e0416c35d139ea5da43c6b45df0e775749347b1b 100644 (file)
--- a/folly/test/ConvTest.cpp
+++ b/folly/test/ConvTest.cpp
@@ -1037,7 +1037,7 @@ DEFINE_BENCHMARK_GROUP(fbstring, 32768);
 
 int main(int argc, char** argv) {
   testing::InitGoogleTest(&argc, argv);
-  google::ParseCommandLineFlags(&argc, &argv, true);
+  gflags::ParseCommandLineFlags(&argc, &argv, true);
   auto ret = RUN_ALL_TESTS();
   if (!ret && FLAGS_benchmark) {
     folly::runBenchmarks();

diff --git a/folly/test/DeterministicScheduleTest.cpp b/folly/test/DeterministicScheduleTest.cpp
index c01d449f0fa2c5c5fa5d484e2714b487342a9a89..6ec429fb7e8a3884f22fdf1ad7a99beef0554837 100644 (file)
--- a/folly/test/DeterministicScheduleTest.cpp
+++ b/folly/test/DeterministicScheduleTest.cpp
@@ -53,6 +53,6 @@ TEST(DeterministicSchedule, uniformSubset) {
 
 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/DynamicConverterTest.cpp b/folly/test/DynamicConverterTest.cpp
index 5237cb6c5bd0dc3c5a94984501ac1f0bbe211dac..62417bb38a7dd2d1ce71d729170ca7902fcf6d77 100644 (file)
--- a/folly/test/DynamicConverterTest.cpp
+++ b/folly/test/DynamicConverterTest.cpp
@@ -363,7 +363,7 @@ TEST(DynamicConverter, errors) {
 
 int main(int argc, char ** argv) {
   testing::InitGoogleTest(&argc, argv);
-  google::ParseCommandLineFlags(&argc, &argv, true);
+  gflags::ParseCommandLineFlags(&argc, &argv, true);
   if (FLAGS_benchmark) {
     folly::runBenchmarks();
   }

diff --git a/folly/test/DynamicTest.cpp b/folly/test/DynamicTest.cpp
index 1e3e25cc93c5ed8bb43727c3cab84fc80a64d22b..6e1002cc5c9cec9d791cfbc7225a1b6948001930 100644 (file)
--- a/folly/test/DynamicTest.cpp
+++ b/folly/test/DynamicTest.cpp
@@ -315,7 +315,7 @@ TEST(Dynamic, ArrayGenerator) {
 
 int main(int argc, char** argv) {
   testing::InitGoogleTest(&argc, argv);
-  google::ParseCommandLineFlags(&argc, &argv, true);
+  gflags::ParseCommandLineFlags(&argc, &argv, true);
   if (FLAGS_benchmark) {
     folly::runBenchmarks();
   }

diff --git a/folly/test/ExceptionTest.cpp b/folly/test/ExceptionTest.cpp
index 690a2b1837ac93526688105c7a86957216ed9512..5bf586ac235bb788f1309da59f05c6f0141f1fec 100644 (file)
--- a/folly/test/ExceptionTest.cpp
+++ b/folly/test/ExceptionTest.cpp
@@ -91,7 +91,7 @@ TEST(ExceptionTest, Simple) {
 
 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/ExceptionWrapperBenchmark.cpp b/folly/test/ExceptionWrapperBenchmark.cpp
index ba412fe5120e4d8788ff40461faf2f092267381a..e78951988084723179412a3dbe8e667024bafcba 100644 (file)
--- a/folly/test/ExceptionWrapperBenchmark.cpp
+++ b/folly/test/ExceptionWrapperBenchmark.cpp
@@ -210,7 +210,7 @@ BENCHMARK_RELATIVE(exception_wrapper_create_and_cast_concurrent, iters) {
 }
 
 int main(int argc, char *argv[]) {
-  google::ParseCommandLineFlags(&argc, &argv, true);
+  gflags::ParseCommandLineFlags(&argc, &argv, true);
   folly::runBenchmarks();
   return 0;
 }

diff --git a/folly/test/FBStringBenchmark.cpp b/folly/test/FBStringBenchmark.cpp
index 359f1b46d2f3c3982c65e17d66a29c4b0118b6cb..9539effe6eac236b907bdf6e1bf56cc66710adaf 100644 (file)
--- a/folly/test/FBStringBenchmark.cpp
+++ b/folly/test/FBStringBenchmark.cpp
@@ -93,7 +93,7 @@ std::list<char> RandomList(unsigned int maxSize) {
 #undef STRING
 
 int main(int argc, char** argv) {
-  google::ParseCommandLineFlags(&argc, &argv, true);
+  gflags::ParseCommandLineFlags(&argc, &argv, true);
   folly::runBenchmarks();
   return 0;
 }

diff --git a/folly/test/FBStringTest.cpp b/folly/test/FBStringTest.cpp
index 8133b0167b9db8138e4d9666e1cba74554caa53d..65df20ba382f24837f98abe0382ed7390feb953a 100644 (file)
--- a/folly/test/FBStringTest.cpp
+++ b/folly/test/FBStringTest.cpp
@@ -1247,6 +1247,6 @@ TEST(FBString, moveTerminator) {
 
 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/FBVectorBenchmark.cpp b/folly/test/FBVectorBenchmark.cpp
index f498e7e8c9753ef80296cb868e265f8b86a04e17..2e20e39f0be72309a187f60b2ec28d85e5b272c8 100644 (file)
--- a/folly/test/FBVectorBenchmark.cpp
+++ b/folly/test/FBVectorBenchmark.cpp
@@ -106,7 +106,7 @@ typedef fbvector<folly::fbstring> FBStringFBVector;
 #undef VECTOR
 
 int main(int argc, char** argv) {
-  google::ParseCommandLineFlags(&argc, &argv, true);
+  gflags::ParseCommandLineFlags(&argc, &argv, true);
   folly::runBenchmarks();
   return 0;
 }

diff --git a/folly/test/FBVectorTest.cpp b/folly/test/FBVectorTest.cpp
index 919063e81d379c42fe0e6147b2dfbbe111ae3d4f..74d15054890753e21f607e7ad3c66ca93cb208ec 100644 (file)
--- a/folly/test/FBVectorTest.cpp
+++ b/folly/test/FBVectorTest.cpp
@@ -276,6 +276,6 @@ TEST(FBVector, vector_of_maps) {
 
 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/FileTestLockHelper.cpp b/folly/test/FileTestLockHelper.cpp
index 44487eb9b0041cdf663e485bb8c35e35d801f8a7..62e4f7ecac6caaac8df44352d3b1dea0d4b89b12 100644 (file)
--- a/folly/test/FileTestLockHelper.cpp
+++ b/folly/test/FileTestLockHelper.cpp
@@ -23,7 +23,7 @@ DEFINE_bool(s, false, "get shared lock");
 DEFINE_bool(x, false, "get exclusive lock");
 
 int main(int argc, char *argv[]) {
-  google::ParseCommandLineFlags(&argc, &argv, true);
+  gflags::ParseCommandLineFlags(&argc, &argv, true);
   google::InitGoogleLogging(argv[0]);
   CHECK_EQ(FLAGS_s + FLAGS_x, 1)
     << "exactly one of -s and -x must be specified";

diff --git a/folly/test/FileUtilTest.cpp b/folly/test/FileUtilTest.cpp
index 5e711a0cac21670851e97c5eed96fff3d0cacecf..698320c0a8a1794f5beeb553af5f6cd26ae8b36b 100644 (file)
--- a/folly/test/FileUtilTest.cpp
+++ b/folly/test/FileUtilTest.cpp
@@ -287,6 +287,6 @@ TEST(String, readFile) {
 
 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/FingerprintTest.cpp b/folly/test/FingerprintTest.cpp
index a4cc9142b0842214acf153e0c830209e93629945..42ebb3fc466d967da0a2c6f642d402d630409462 100644 (file)
--- a/folly/test/FingerprintTest.cpp
+++ b/folly/test/FingerprintTest.cpp
@@ -165,7 +165,7 @@ TEST(Fingerprint, Alignment) {
 
 int main(int argc, char *argv[]) {
   testing::InitGoogleTest(&argc, argv);
-  google::ParseCommandLineFlags(&argc, &argv, true);
+  gflags::ParseCommandLineFlags(&argc, &argv, true);
   auto ret = RUN_ALL_TESTS();
   if (!ret) {
     folly::runBenchmarksOnFlag();

diff --git a/folly/test/FormatBenchmark.cpp b/folly/test/FormatBenchmark.cpp
index 7acf893a225976270399d448294ae646b1fa29c5..1760ce2201d46221248e9f2bc561620604ad81ca 100644 (file)
--- a/folly/test/FormatBenchmark.cpp
+++ b/folly/test/FormatBenchmark.cpp
@@ -181,7 +181,7 @@ BENCHMARK_RELATIVE(format_nested_direct, iters) {
 // ============================================================================
 
 int main(int argc, char *argv[]) {
-  google::ParseCommandLineFlags(&argc, &argv, true);
+  gflags::ParseCommandLineFlags(&argc, &argv, true);
   runBenchmarks();
   return 0;
 }

diff --git a/folly/test/FormatTest.cpp b/folly/test/FormatTest.cpp
index e49e97cefa89351a1fd9946ff20a7a50496ae015..5e015e62aca63322ed9f38124e0347812e7de4bc 100644 (file)
--- a/folly/test/FormatTest.cpp
+++ b/folly/test/FormatTest.cpp
@@ -381,7 +381,7 @@ TEST(Format, BogusFormatString) {
 
 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/FutexTest.cpp b/folly/test/FutexTest.cpp
index 2669a3b9661e1f20b6036b2d254770a734ce333b..eff4d14b5de15afb8db31f4b0fe98ea6f6d658bf 100644 (file)
--- a/folly/test/FutexTest.cpp
+++ b/folly/test/FutexTest.cpp
@@ -180,7 +180,7 @@ TEST(Futex, basic_deterministic) {
 
 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/HistogramBenchmark.cpp b/folly/test/HistogramBenchmark.cpp
index 27b08258e1d113416acbf083a51d9162bdd6b7c1..a71de1e1e474dde15fc0a4e94e90bc3892e15b68 100644 (file)
--- a/folly/test/HistogramBenchmark.cpp
+++ b/folly/test/HistogramBenchmark.cpp
@@ -37,7 +37,7 @@ BENCHMARK_NAMED_PARAM(addValue, 0_to_1000, 10, 0, 1000);
 BENCHMARK_NAMED_PARAM(addValue, 5k_to_20k, 250, 5000, 20000);
 
 int main(int argc, char *argv[]) {
-  google::ParseCommandLineFlags(&argc, &argv, true);
+  gflags::ParseCommandLineFlags(&argc, &argv, true);
   folly::runBenchmarks();
   return 0;
 }

diff --git a/folly/test/IndexedMemPoolTest.cpp b/folly/test/IndexedMemPoolTest.cpp
index 40f3dd1377b84e972c9871e92f95f468c92b248a..b2b68292c935290d7c710e202fc53cdd8ef9d4be 100644 (file)
--- a/folly/test/IndexedMemPoolTest.cpp
+++ b/folly/test/IndexedMemPoolTest.cpp
@@ -157,6 +157,6 @@ TEST(IndexedMemPool, locate_elem) {
 
 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/JsonTest.cpp b/folly/test/JsonTest.cpp
index 0c2b6d5a31fee7cd6af3139b89e77424ddab0378..03bbcb4a516fa299dd206bb1340b87cc80f0736b 100644 (file)
--- a/folly/test/JsonTest.cpp
+++ b/folly/test/JsonTest.cpp
@@ -479,7 +479,7 @@ BENCHMARK(toJson, iters) {
 
 int main(int argc, char** argv) {
   testing::InitGoogleTest(&argc, argv);
-  google::ParseCommandLineFlags(&argc, &argv, true);
+  gflags::ParseCommandLineFlags(&argc, &argv, true);
   if (FLAGS_benchmark) {
     folly::runBenchmarks();
   }

diff --git a/folly/test/LifoSemTests.cpp b/folly/test/LifoSemTests.cpp
index 12ec0f2e06bf92b9251b9f8b7ada042c977e5657..15ef5e02d10d2f25fdb5e522366b8ef3781643ce 100644 (file)
--- a/folly/test/LifoSemTests.cpp
+++ b/folly/test/LifoSemTests.cpp
@@ -430,7 +430,7 @@ BENCHMARK_NAMED_PARAM(contendedUse, 32_to_1000, 32, 1000)
 
 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/LoggingTest.cpp b/folly/test/LoggingTest.cpp
index cb45d797c1734fdcdd30f9ca7ce31914f6bce3ff..19d2341822668dbafcc8f23dd6c32258533e487a 100644 (file)
--- a/folly/test/LoggingTest.cpp
+++ b/folly/test/LoggingTest.cpp
@@ -71,7 +71,7 @@ BENCHMARK(dev_null_log_overhead, iter) {
 
 int main(int argc, char** argv) {
   testing::InitGoogleTest(&argc, argv);
-  google::ParseCommandLineFlags(&argc, &argv, true);
+  gflags::ParseCommandLineFlags(&argc, &argv, true);
 
   auto rv = RUN_ALL_TESTS();
   if (!rv && FLAGS_benchmark) {

diff --git a/folly/test/MPMCPipelineTest.cpp b/folly/test/MPMCPipelineTest.cpp
index f754eda892a08b8e4b365d377a5216b3be9612d4..6fd93be01e67142c74d391e8e867f741808b8550 100644 (file)
--- a/folly/test/MPMCPipelineTest.cpp
+++ b/folly/test/MPMCPipelineTest.cpp
@@ -160,7 +160,7 @@ TEST(MPMCPipeline, MultiThreaded) {
 
 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/MPMCQueueTest.cpp b/folly/test/MPMCQueueTest.cpp
index 81dce2633d8d8915e2ae5170cabc4688dfff0cd8..e688d770c4926ef7d91e925ddd8b0dc794555d11 100644 (file)
--- a/folly/test/MPMCQueueTest.cpp
+++ b/folly/test/MPMCQueueTest.cpp
@@ -633,6 +633,6 @@ TEST(MPMCQueue, queue_moving) {
 
 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/MemoryIdlerTest.cpp b/folly/test/MemoryIdlerTest.cpp
index 99630d944b6cd5231cfed4fb19e1625838bb1f09..3e5e6e282b27f44737ca678665d7004266b1bb85 100644 (file)
--- a/folly/test/MemoryIdlerTest.cpp
+++ b/folly/test/MemoryIdlerTest.cpp
@@ -198,7 +198,7 @@ BENCHMARK(releaseMallocTLS, iters) {
 
 int main(int argc, char** argv) {
   testing::InitGoogleTest(&argc, argv);
-  google::ParseCommandLineFlags(&argc, &argv, true);
+  gflags::ParseCommandLineFlags(&argc, &argv, true);
 
   auto rv = RUN_ALL_TESTS();
   if (!rv && FLAGS_benchmark) {

diff --git a/folly/test/ProducerConsumerQueueBenchmark.cpp b/folly/test/ProducerConsumerQueueBenchmark.cpp
index 84c9563cb9bd601dd2e2b8eb808c4a2f0d81023b..73f6a3246a94f189b9b6c7a63fd17759fcb1315e 100644 (file)
--- a/folly/test/ProducerConsumerQueueBenchmark.cpp
+++ b/folly/test/ProducerConsumerQueueBenchmark.cpp
@@ -232,7 +232,7 @@ BENCHMARK_PARAM(BM_ProducerConsumerLatency, 1048574);
 
 int main(int argc, char** argv) {
   google::InitGoogleLogging(argv[0]);
-  google::ParseCommandLineFlags(&argc, &argv, true);
+  gflags::ParseCommandLineFlags(&argc, &argv, true);
 
   runBenchmarks();
   return 0;

diff --git a/folly/test/RWSpinLockTest.cpp b/folly/test/RWSpinLockTest.cpp
index 077c061aab0de484c8ef802900d481a57e5cd07d..1d88a4344f73c5f3da30d52aaa88e8b913fffcd4 100644 (file)
--- a/folly/test/RWSpinLockTest.cpp
+++ b/folly/test/RWSpinLockTest.cpp
@@ -237,6 +237,6 @@ TEST(RWSpinLock, concurrent_holder_test) {
 
 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/RandomTest.cpp b/folly/test/RandomTest.cpp
index 8653faf6e0074e00b7432c21a0e196a0a19a110f..c11bf6f9f6981444f1d109cd66a7536d641df180 100644 (file)
--- a/folly/test/RandomTest.cpp
+++ b/folly/test/RandomTest.cpp
@@ -113,7 +113,7 @@ BENCHMARK(Random64OneIn) { doNotOptimizeAway(Random::oneIn(100)); }
 
 int main(int argc, char** argv) {
   testing::InitGoogleTest(&argc, argv);
-  google::ParseCommandLineFlags(&argc, &argv, true);
+  gflags::ParseCommandLineFlags(&argc, &argv, true);
 
   if (FLAGS_benchmark) {
     folly::runBenchmarks();

diff --git a/folly/test/RangeFindBenchmark.cpp b/folly/test/RangeFindBenchmark.cpp
index b4bc559869b87f2c3cffdac052e89701aaae4ad3..065e6a3faf8dce91517b5012f9f2eb16d2d9ba57 100644 (file)
--- a/folly/test/RangeFindBenchmark.cpp
+++ b/folly/test/RangeFindBenchmark.cpp
@@ -337,7 +337,7 @@ BENCHMARK(FindFirstOfOffsetRange, n) {
 BENCHMARK_DRAW_LINE();
 
 int main(int argc, char** argv) {
-  google::ParseCommandLineFlags(&argc, &argv, true);
+  gflags::ParseCommandLineFlags(&argc, &argv, true);
 
   for (int len : {1, 8, 10, 16, 32, 64, 128, 256, 10*1024, 1024*1024}) {
     initStr(len);

diff --git a/folly/test/ScopeGuardTest.cpp b/folly/test/ScopeGuardTest.cpp
index 285dd445955680fb14c47fbf8982c9641b81189d..9eb345b555c2ce09a895418f7bbc496a34bf8a1e 100644 (file)
--- a/folly/test/ScopeGuardTest.cpp
+++ b/folly/test/ScopeGuardTest.cpp
@@ -293,6 +293,6 @@ TEST(ScopeGuard, TEST_SCOPE_SUCCESS_THROW) {
 
 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/StringTest.cpp b/folly/test/StringTest.cpp
index c6da53063c9f0afe481b2c0dd176110aee84ca62..0a1ac9e437e2cca1b1e69c4cd95f5b82176d6a0e 100644 (file)
--- a/folly/test/StringTest.cpp
+++ b/folly/test/StringTest.cpp
@@ -1114,7 +1114,7 @@ BENCHMARK(joinInt, iters) {
 
 int main(int argc, char *argv[]) {
   testing::InitGoogleTest(&argc, argv);
-  google::ParseCommandLineFlags(&argc, &argv, true);
+  gflags::ParseCommandLineFlags(&argc, &argv, true);
   auto ret = RUN_ALL_TESTS();
   if (!ret) {
     initBenchmark();

diff --git a/folly/test/SubprocessTestParentDeathHelper.cpp b/folly/test/SubprocessTestParentDeathHelper.cpp
index e5db86d19b57e7e2ba7fd759111ae6980bd7a73d..fd1d42ea29220cb9c2b3d47414a3169bc12edc5c 100644 (file)
--- a/folly/test/SubprocessTestParentDeathHelper.cpp
+++ b/folly/test/SubprocessTestParentDeathHelper.cpp
@@ -74,7 +74,7 @@ void runParent(const char* file) {
 }
 
 int main(int argc, char *argv[]) {
-  google::ParseCommandLineFlags(&argc, &argv, true);
+  gflags::ParseCommandLineFlags(&argc, &argv, true);
   CHECK_EQ(argc, 2);
   if (FLAGS_child) {
     runChild(argv[1]);

diff --git a/folly/test/ThreadCachedArenaTest.cpp b/folly/test/ThreadCachedArenaTest.cpp
index 8f89d8adc38216f8c8901feacc4acb370048bc31..1c68dfe277b17961e81ad2cd8fbed946b18b3ff3 100644 (file)
--- a/folly/test/ThreadCachedArenaTest.cpp
+++ b/folly/test/ThreadCachedArenaTest.cpp
@@ -256,7 +256,7 @@ BENCHMARK_DRAW_LINE()
 
 int main(int argc, char *argv[]) {
   testing::InitGoogleTest(&argc, argv);
-  google::ParseCommandLineFlags(&argc, &argv, true);
+  gflags::ParseCommandLineFlags(&argc, &argv, true);
   auto ret = RUN_ALL_TESTS();
   if (!ret && FLAGS_benchmark) {
     folly::runBenchmarks();

diff --git a/folly/test/ThreadCachedIntTest.cpp b/folly/test/ThreadCachedIntTest.cpp
index 231763d5855ee16adcaf88da4452f7757ad89ea3..9612b02bafa1c04ba124748666409676be31dd7d 100644 (file)
--- a/folly/test/ThreadCachedIntTest.cpp
+++ b/folly/test/ThreadCachedIntTest.cpp
@@ -239,9 +239,9 @@ BENCHMARK_DRAW_LINE();
 
 int main(int argc, char** argv) {
   testing::InitGoogleTest(&argc, argv);
-  google::ParseCommandLineFlags(&argc, &argv, true);
-  google::SetCommandLineOptionWithMode(
-    "bm_min_usec", "10000", google::SET_FLAG_IF_DEFAULT
+  gflags::ParseCommandLineFlags(&argc, &argv, true);
+  gflags::SetCommandLineOptionWithMode(
+    "bm_min_usec", "10000", gflags::SET_FLAG_IF_DEFAULT
   );
   if (FLAGS_benchmark) {
     folly::runBenchmarks();

diff --git a/folly/test/ThreadLocalTest.cpp b/folly/test/ThreadLocalTest.cpp
index a5de491618c153cd2f94d15c2e67841ac1432e51..36917139a23880704572367e063d3f25dd2df2d6 100644 (file)
--- a/folly/test/ThreadLocalTest.cpp
+++ b/folly/test/ThreadLocalTest.cpp
@@ -572,9 +572,9 @@ BENCHMARK_DRAW_LINE();
 
 int main(int argc, char** argv) {
   testing::InitGoogleTest(&argc, argv);
-  google::ParseCommandLineFlags(&argc, &argv, true);
-  google::SetCommandLineOptionWithMode(
-    "bm_max_iters", "100000000", google::SET_FLAG_IF_DEFAULT
+  gflags::ParseCommandLineFlags(&argc, &argv, true);
+  gflags::SetCommandLineOptionWithMode(
+    "bm_max_iters", "100000000", gflags::SET_FLAG_IF_DEFAULT
   );
   if (FLAGS_benchmark) {
     folly::runBenchmarks();

diff --git a/folly/test/TimeseriesBenchmark.cpp b/folly/test/TimeseriesBenchmark.cpp
index 9ce8ba4a932d91bf5eed6baaf553c29d53fcfbb9..236e47d94613bc03579a8e1027bf03e7e1e9b922 100644 (file)
--- a/folly/test/TimeseriesBenchmark.cpp
+++ b/folly/test/TimeseriesBenchmark.cpp
@@ -71,7 +71,7 @@ BENCHMARK_NAMED_PARAM(addValue, 71x5_100perSec, seconds(71), 5, 100);
 BENCHMARK_NAMED_PARAM(addValue, 1x1_100perSec, seconds(1), 1, 100);
 
 int main(int argc, char *argv[]) {
-  google::ParseCommandLineFlags(&argc, &argv, true);
+  gflags::ParseCommandLineFlags(&argc, &argv, true);
   folly::runBenchmarks();
   return 0;
 }

diff --git a/folly/test/TraitsTest.cpp b/folly/test/TraitsTest.cpp
index 129ad83ddb006d1cd3d5c36bb50439e090d1f14f..90a31d0fefa5be82c135f41ac746651634e85981 100644 (file)
--- a/folly/test/TraitsTest.cpp
+++ b/folly/test/TraitsTest.cpp
@@ -120,7 +120,7 @@ TEST(Traits, is_complete) {
 
 int main(int argc, char ** argv) {
   testing::InitGoogleTest(&argc, argv);
-  google::ParseCommandLineFlags(&argc, &argv, true);
+  gflags::ParseCommandLineFlags(&argc, &argv, true);
   if (FLAGS_benchmark) {
     folly::runBenchmarks();
   }

diff --git a/folly/test/VarintTest.cpp b/folly/test/VarintTest.cpp
index 812b888baea3a4d08250f4bed7507c88f1eb6965..59d1a7f26e7ad1a4af3a7afdfa2f1bbe88ca3860 100644 (file)
--- a/folly/test/VarintTest.cpp
+++ b/folly/test/VarintTest.cpp
@@ -172,7 +172,7 @@ BENCHMARK(VarintDecoding, iters) {
 
 int main(int argc, char *argv[]) {
   testing::InitGoogleTest(&argc, argv);
-  google::ParseCommandLineFlags(&argc, &argv, true);
+  gflags::ParseCommandLineFlags(&argc, &argv, true);
   google::InitGoogleLogging(argv[0]);
   int ret = RUN_ALL_TESTS();
   if (ret == 0) {

diff --git a/folly/test/function_benchmark/main.cpp b/folly/test/function_benchmark/main.cpp
index c2d03ecab9ed1781ac65520ced3289768d1f5556..13d8a67fe5d74f37e38bbcaf8b7e8c3685bab4e7 100644 (file)
--- a/folly/test/function_benchmark/main.cpp
+++ b/folly/test/function_benchmark/main.cpp
@@ -263,6 +263,6 @@ BENCHMARK(return_code_noexcept, iters) {
 // main()
 
 int main(int argc, char** argv) {
-  google::ParseCommandLineFlags(&argc, &argv, true);
+  gflags::ParseCommandLineFlags(&argc, &argv, true);
   folly::runBenchmarks();
 }

diff --git a/folly/test/stl_tests/StlVectorTest.cpp b/folly/test/stl_tests/StlVectorTest.cpp
index 5ad8b9da84383473eda451479e93856da187a880..6f68ec9eab12636f8125e7a2df90560d92ed8061 100644 (file)
--- a/folly/test/stl_tests/StlVectorTest.cpp
+++ b/folly/test/stl_tests/StlVectorTest.cpp
@@ -2722,7 +2722,7 @@ STL_TEST("attach", attach, is_destructible, a) {
 
 int main(int argc, char** argv) {
   testing::InitGoogleTest(&argc, argv);
-  google::ParseCommandLineFlags(&argc, &argv, true);
+  gflags::ParseCommandLineFlags(&argc, &argv, true);
 
   return RUN_ALL_TESTS();
 }
@@ -2737,7 +2737,7 @@ TEST(placeholder, gccversion) {}
 
 int main(int argc, char** argv) {
   testing::InitGoogleTest(&argc, argv);
-  google::ParseCommandLineFlags(&argc, &argv, true);
+  gflags::ParseCommandLineFlags(&argc, &argv, true);
 
   return RUN_ALL_TESTS();
 }