diff options
author | Zeno Albisser <zeno.albisser@digia.com> | 2013-10-28 10:59:26 +0100 |
---|---|---|
committer | Zeno Albisser <zeno.albisser@digia.com> | 2013-10-28 15:20:23 +0100 |
commit | 8db32b21af616e363072d88f73b89359b1dc713a (patch) | |
tree | 6e7f709e9e30f95b38bbd6a3961579413a1f6df4 | |
parent | c9d97c73d7b1295b8c714ccaf1e5b717841bccc2 (diff) | |
download | qtwebengine-chromium-8db32b21af616e363072d88f73b89359b1dc713a.tar.gz |
Do not forward declare WebRtcVoiceChannelInfo.
Clang / libc++ does not support incomplete types in
templates. See:
http://clang.llvm.org/compatibility.html#undep_incomplete
This fixes the fixes the "error: field has incomplete type" compiler error.
This patch will be squashed into the next chromium update.
Change-Id: I0af464b517d112a1a88a4598105eb3d60a91c723
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
-rw-r--r-- | chromium/third_party/libjingle/source/talk/media/webrtc/webrtcvoiceengine.cc | 13 | ||||
-rw-r--r-- | chromium/third_party/libjingle/source/talk/media/webrtc/webrtcvoiceengine.h | 13 |
2 files changed, 12 insertions, 14 deletions
diff --git a/chromium/third_party/libjingle/source/talk/media/webrtc/webrtcvoiceengine.cc b/chromium/third_party/libjingle/source/talk/media/webrtc/webrtcvoiceengine.cc index 855a9e4236a..433138562bc 100644 --- a/chromium/third_party/libjingle/source/talk/media/webrtc/webrtcvoiceengine.cc +++ b/chromium/third_party/libjingle/source/talk/media/webrtc/webrtcvoiceengine.cc @@ -1472,19 +1472,6 @@ void WebRtcVoiceEngine::StopAecDump() { } } -// This struct relies on the generated copy constructor and assignment operator -// since it is used in an stl::map. -struct WebRtcVoiceMediaChannel::WebRtcVoiceChannelInfo { - WebRtcVoiceChannelInfo() : channel(-1), renderer(NULL) {} - WebRtcVoiceChannelInfo(int ch, AudioRenderer* r) - : channel(ch), - renderer(r) {} - ~WebRtcVoiceChannelInfo() {} - - int channel; - AudioRenderer* renderer; -}; - // WebRtcVoiceMediaChannel WebRtcVoiceMediaChannel::WebRtcVoiceMediaChannel(WebRtcVoiceEngine *engine) : WebRtcMediaChannel<VoiceMediaChannel, WebRtcVoiceEngine>( diff --git a/chromium/third_party/libjingle/source/talk/media/webrtc/webrtcvoiceengine.h b/chromium/third_party/libjingle/source/talk/media/webrtc/webrtcvoiceengine.h index 0c2b613ac46..76f5be7af39 100644 --- a/chromium/third_party/libjingle/source/talk/media/webrtc/webrtcvoiceengine.h +++ b/chromium/third_party/libjingle/source/talk/media/webrtc/webrtcvoiceengine.h @@ -374,7 +374,18 @@ class WebRtcVoiceMediaChannel static Error WebRtcErrorToChannelError(int err_code); private: - struct WebRtcVoiceChannelInfo; + // This struct relies on the generated copy constructor and assignment operator + // since it is used in an stl::map. + struct WebRtcVoiceChannelInfo { + WebRtcVoiceChannelInfo() : channel(-1), renderer(NULL) {} + WebRtcVoiceChannelInfo(int ch, AudioRenderer* r) + : channel(ch), + renderer(r) {} + ~WebRtcVoiceChannelInfo() {} + + int channel; + AudioRenderer* renderer; + }; typedef std::map<uint32, WebRtcVoiceChannelInfo> ChannelMap; void SetNack(uint32 ssrc, int channel, bool nack_enabled); |