[incubator-brpc] branch master updated: Add :: before namespace logging

[jamesge]

This is an automated email from the ASF dual-hosted git repository.

jamesge pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-brpc.git


The following commit(s) were added to refs/heads/master by this push:
     new 6d3a6e1  Add :: before namespace logging
6d3a6e1 is described below

commit 6d3a6e1e655479bb2b04944091a94d1a3afeb31b
Author: jamesge <jge...@gmail.com>
AuthorDate: Thu Nov 26 16:47:15 2020 +0800

    Add :: before namespace logging
---
 src/brpc/controller.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/brpc/controller.cpp b/src/brpc/controller.cpp
index 5c061ee..92f717d 100644
--- a/src/brpc/controller.cpp
+++ b/src/brpc/controller.cpp
@@ -1509,7 +1509,7 @@ void Controller::FlushSessionKV(std::ostream& os) {
         pRID = _http_request->GetHeader(FLAGS_request_id_header);
     }
 
-    if (logging::FLAGS_log_as_json) {
+    if (::logging::FLAGS_log_as_json) {
         os << "\"M\":\"" BRPC_SESSION_END_MSG "\"";
         if (pRID) {
             os << ",\"" BRPC_REQ_ID "\":\"" << *pRID << '"';
@@ -1534,7 +1534,7 @@ Controller::LogPostfixDummy::~LogPostfixDummy() {
 
 std::ostream& operator<<(std::ostream& os, const Controller::LogPostfixDummy& 
p) {
     const_cast<brpc::Controller::LogPostfixDummy&>(p).osptr = &os;
-    if (logging::FLAGS_log_as_json) {
+    if (::logging::FLAGS_log_as_json) {
         os << "\"M\":\"";
     }
     return os;
@@ -1544,14 +1544,14 @@ std::ostream& operator<<(std::ostream& os, const 
Controller::LogPostfixDummy& p)
 Controller::LogPostfixDummy Controller::LogPostfix() const {
     Controller::LogPostfixDummy result;
     std::string& p = result.postfix;
-    if (logging::FLAGS_log_as_json) {
+    if (::logging::FLAGS_log_as_json) {
         p.push_back('"');
     }
     const std::string* pRID = nullptr;
     if (_http_request) {
         pRID = _http_request->GetHeader(FLAGS_request_id_header);
         if (pRID) {
-            if (logging::FLAGS_log_as_json) {
+            if (::logging::FLAGS_log_as_json) {
                 p.append(",\"" BRPC_REQ_ID "\":\"");
                 p.append(*pRID);
                 p.push_back('"');


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@brpc.apache.org
For additional commands, e-mail: dev-h...@brpc.apache.org