Bug 970271: Fix inaccessible base class nsIStreamListener, r=jduell.mcbugs
authorThomas Zimmermann <tdz@users.sourceforge.net>
Thu, 27 Feb 2014 10:18:34 +0100
changeset 171372 c95e7ab2b48b249967a65f7af4d9ef1387dc1d9c
parent 171371 b5d404be0b1e31370d77c8d4aecdcf697814fed0
child 171373 9a60a5c788ceadc1f7cb27fdcb51dca3c0ab7026
push id270
push userpvanderbeken@mozilla.com
push dateThu, 06 Mar 2014 09:24:21 +0000
reviewersjduell
bugs970271
milestone30.0a1
Bug 970271: Fix inaccessible base class nsIStreamListener, r=jduell.mcbugs GCC warns about an inaccessible base class nsIStreamListener in class RtspChannel. Using protected inheritance in nsBaseChannel fixes this.
netwerk/base/src/nsBaseChannel.h
netwerk/protocol/rtsp/RtspChannel.h
--- a/netwerk/base/src/nsBaseChannel.h
+++ b/netwerk/base/src/nsBaseChannel.h
@@ -39,17 +39,17 @@ class nsIInputStream;
 // notifications generated by the transport layer.
 
 class nsBaseChannel : public nsHashPropertyBag
                     , public nsIChannel
                     , public nsIInterfaceRequestor
                     , public nsITransportEventSink
                     , public nsIAsyncVerifyRedirectCallback
                     , public mozilla::net::PrivateBrowsingChannel<nsBaseChannel>
-                    , private nsIStreamListener
+                    , protected nsIStreamListener
 {
 public:
   NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_NSIREQUEST
   NS_DECL_NSICHANNEL
   NS_DECL_NSIINTERFACEREQUESTOR
   NS_DECL_NSITRANSPORTEVENTSINK
   NS_DECL_NSIASYNCVERIFYREDIRECTCALLBACK
--- a/netwerk/protocol/rtsp/RtspChannel.h
+++ b/netwerk/protocol/rtsp/RtspChannel.h
@@ -17,17 +17,16 @@ namespace net {
 // HTMLMediaElement. Actual network control and data flows are managed by an
 // RtspController object created and owned by RtspMediaResource.
 // Therefore, when RtspChannel::AsyncOpen is called, mListener->OnStartRequest
 // will be called immediately. It is expected that an RtspMediaResource object
 // will be created in that calling context or after; the RtspController object
 // will be created internally by RtspMediaResource."
 
 class RtspChannel : public nsBaseChannel
-                  , public nsIStreamListener
 {
 public:
   NS_DECL_ISUPPORTS
 
   RtspChannel() { }
 
   ~RtspChannel() { }