diff --git a/trunk/src/app/srs_app_rtmp_conn.hpp b/trunk/src/app/srs_app_rtmp_conn.hpp index 75021b71c..6d817098e 100644 --- a/trunk/src/app/srs_app_rtmp_conn.hpp +++ b/trunk/src/app/srs_app_rtmp_conn.hpp @@ -92,7 +92,7 @@ public: /** * the client provides the main logic control for RTMP clients. */ -class SrsRtmpConn : public virtual SrsConnection, public virtual ISrsReloadHandler +class SrsRtmpConn : virtual public SrsConnection, virtual public ISrsReloadHandler { // for the thread to directly access any field of connection. friend class SrsPublishRecvThread; diff --git a/trunk/src/protocol/srs_protocol_io.hpp b/trunk/src/protocol/srs_protocol_io.hpp index 567ee432c..c384a6049 100644 --- a/trunk/src/protocol/srs_protocol_io.hpp +++ b/trunk/src/protocol/srs_protocol_io.hpp @@ -81,7 +81,7 @@ public: /** * the reader for the protocol to read from whatever channel. */ -class ISrsProtocolReader : public virtual ISrsReader, public virtual ISrsProtocolStatistic +class ISrsProtocolReader : virtual public ISrsReader, virtual public ISrsProtocolStatistic { public: ISrsProtocolReader(); @@ -109,7 +109,7 @@ public: /** * the writer for the protocol to write to whatever channel. */ -class ISrsProtocolWriter : public virtual ISrsWriter, public virtual ISrsProtocolStatistic +class ISrsProtocolWriter : virtual public ISrsWriter, virtual public ISrsProtocolStatistic { public: ISrsProtocolWriter(); @@ -130,7 +130,7 @@ public: /** * the reader and writer. */ -class ISrsProtocolReaderWriter : public virtual ISrsProtocolReader, public virtual ISrsProtocolWriter +class ISrsProtocolReaderWriter : virtual public ISrsProtocolReader, virtual public ISrsProtocolWriter { public: ISrsProtocolReaderWriter(); diff --git a/trunk/src/protocol/srs_protocol_kbps.hpp b/trunk/src/protocol/srs_protocol_kbps.hpp index d3fc5432f..0de8bbb77 100644 --- a/trunk/src/protocol/srs_protocol_kbps.hpp +++ b/trunk/src/protocol/srs_protocol_kbps.hpp @@ -157,12 +157,12 @@ public: * SrsKbps* kbps = ...; * kbps->set_io(in, out); * // both kbps->get_recv_bytes() and kbps->get_send_bytes() are available. - * // we can use the kbps as the data source of another kbps: + * // we can use the kbps as the data source of another kbps: * SrsKbps* user = ...; * user->set_io(kbps, kbps); * the server never know how many bytes already send/recv, for the connection maybe closed. */ -class SrsKbps : public virtual ISrsProtocolStatistic, public virtual IKbpsDelta +class SrsKbps : virtual public ISrsProtocolStatistic, virtual public IKbpsDelta { private: SrsKbpsSlice is;