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>

diff --cc src/common/buffer.cc
Simple merge

diff --cc src/common/options.cc
Simple merge

diff --cc src/mon/MonClient.cc
Simple merge

diff --cc src/msg/async/Event.h
Simple merge

diff --cc src/msg/async/ProtocolV1.cc
Simple merge

diff --cc src/msg/async/ProtocolV1.h
index 3f63a68b2e56f716dc753b144b3a8e80f1a33c35,b56a966dbd74540c7eba060c56aec0903e8e93c6..b23860e8a015cf52b9296ded19385e33a9b5c3a1
--- 1/src/msg/async/ProtocolV1.h
--- 2/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);

diff --cc src/msg/async/ProtocolV2.cc
Simple merge

diff --cc src/msg/async/ProtocolV2.h
Simple merge