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
This commit is contained in:
YM CHEN
2015-05-01 11:21:58 +08:00
committed by Praveen Kumar Ramakrishnan
parent 4c929bc52d
commit 56e4be21c4
7 changed files with 8 additions and 7 deletions
+1 -1
View File
@@ -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();
+1 -1
View File
@@ -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();
}
+2 -1
View File
@@ -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();
}
+1 -1
View File
@@ -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();
}
+1 -1
View File
@@ -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();
+1 -1
View File
@@ -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();
+1 -1
View File
@@ -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();
}