From: Kefu Chai <kchai@redhat.com>
Date: Sat, 21 Mar 2020 02:33:16 +0000 (+0800)
Subject: Merge pull request #33796 from adamemerson/wip-using-namespace-common
X-Git-Tag: v16.0.0~18
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=25ac1528419371686740412616145703810a561f;p=ceph-ci.git

Merge pull request #33796 from adamemerson/wip-using-namespace-common

Build the target 'common' without relying on using namespace in headers

Reviewed-by: Kefu Chai <kchai@redhat.com>
---

25ac1528419371686740412616145703810a561f
diff --cc src/msg/async/ProtocolV1.h
index 3f63a68b2e5,b56a966dbd7..b23860e8a01
--- a/src/msg/async/ProtocolV1.h
+++ b/src/msg/async/ProtocolV1.h
@@@ -204,9 -204,8 +204,9 @@@ protected
    void discard_out_queue();
  
    void reset_recv_state();
 +  void reset_security();
  
-   ostream &_conn_prefix(std::ostream *_dout);
+   std::ostream& _conn_prefix(std::ostream *_dout);
  
  public:
    ProtocolV1(AsyncConnection *connection);