fix for conflict

303a3714 · root · caidaojin · 7d4b3c05 · 303a3714
Commit 303a3714 authored Aug 08, 2018 by root Committed by caidaojin Aug 24, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

controller.h src/brpc/controller.h +4 -0

No files found.
--- a/src/brpc/controller.h
+++ b/src/brpc/controller.h
@@ -62,6 +62,8 @@ class MongoContext;
 class RetryPolicy;
 class InputMessageBase;
 class ThriftStub;
+class CouchbaseChannel;
+class CouchbaseDone;
 namespace policy {
 class OnServerStreamCreated;
 void ProcessMongoRequest(InputMessageBase*);
@@ -110,6 +112,8 @@ friend class CouchbaseDone;
 friend class schan::Sender;
 friend class schan::SubDone;
 friend class policy::OnServerStreamCreated;
+friend class CouchbaseChannel;
+friend class CouchbaseDone;
 friend int StreamCreate(StreamId*, Controller&, const StreamOptions*);
 friend int StreamAccept(StreamId*, Controller&, const StreamOptions*);
 friend void policy::ProcessMongoRequest(InputMessageBase*);