Merge pull request #338 from renzhong/master

use GFLAGS_NS instead of google

test/brpc_ssl_unittest.cpp

@@ -25,7 +25,7 @@ void ExtractHostnames(X509* x, std::vector<std::string>* hostnames);
 
 int main(int argc, char* argv[]) {
     testing::InitGoogleTest(&argc, argv);
-    google::ParseCommandLineFlags(&argc, &argv, true);
+    GFLAGS_NS::ParseCommandLineFlags(&argc, &argv, true);
     brpc::GlobalInitializeOrDie();
     return RUN_ALL_TESTS();
 }

test/bthread_setconcurrency_unittest.cpp

@@ -127,13 +127,13 @@ void* add_concurrency_proc(void*) {
 bool set_min_concurrency(int num) {
     std::stringstream ss;
     ss << num;
-    std::string ret = google::SetCommandLineOption("bthread_min_concurrency", ss.str().c_str());
+    std::string ret = GFLAGS_NS::SetCommandLineOption("bthread_min_concurrency", ss.str().c_str());
     return !ret.empty();
 }
 
 int get_min_concurrency() {
     std::string ret;
-    google::GetCommandLineOption("bthread_min_concurrency", &ret);
+    GFLAGS_NS::GetCommandLineOption("bthread_min_concurrency", &ret);
     return atoi(ret.c_str());
 }