| Index: webrtc/media/base/mediachannel.h
|
| diff --git a/webrtc/media/base/mediachannel.h b/webrtc/media/base/mediachannel.h
|
| index ee431537b965fd7558728cf9bb6134ff3ac7ab7b..3e66bcb746802bb9d4d23d255be6825fcffbcec9 100644
|
| --- a/webrtc/media/base/mediachannel.h
|
| +++ b/webrtc/media/base/mediachannel.h
|
| @@ -11,6 +11,7 @@
|
| #ifndef WEBRTC_MEDIA_BASE_MEDIACHANNEL_H_
|
| #define WEBRTC_MEDIA_BASE_MEDIACHANNEL_H_
|
|
|
| +#include <algorithm>
|
| #include <memory>
|
| #include <string>
|
| #include <vector>
|
| @@ -352,7 +353,7 @@ class MediaChannel : public sigslot::has_slots<> {
|
| virtual ~NetworkInterface() {}
|
| };
|
|
|
| - MediaChannel(const MediaConfig& config)
|
| + explicit MediaChannel(const MediaConfig& config)
|
| : enable_dscp_(config.enable_dscp), network_interface_(NULL) {}
|
| MediaChannel() : enable_dscp_(false), network_interface_(NULL) {}
|
| virtual ~MediaChannel() {}
|
| @@ -886,7 +887,8 @@ class VoiceMediaChannel : public MediaChannel {
|
| };
|
|
|
| VoiceMediaChannel() {}
|
| - VoiceMediaChannel(const MediaConfig& config) : MediaChannel(config) {}
|
| + explicit VoiceMediaChannel(const MediaConfig& config)
|
| + : MediaChannel(config) {}
|
| virtual ~VoiceMediaChannel() {}
|
| virtual bool SetSendParameters(const AudioSendParameters& params) = 0;
|
| virtual bool SetRecvParameters(const AudioRecvParameters& params) = 0;
|
| @@ -970,7 +972,8 @@ class VideoMediaChannel : public MediaChannel {
|
| };
|
|
|
| VideoMediaChannel() {}
|
| - VideoMediaChannel(const MediaConfig& config) : MediaChannel(config) {}
|
| + explicit VideoMediaChannel(const MediaConfig& config)
|
| + : MediaChannel(config) {}
|
| virtual ~VideoMediaChannel() {}
|
|
|
| virtual bool SetSendParameters(const VideoSendParameters& params) = 0;
|
|
|