From 8db32b21af616e363072d88f73b89359b1dc713a Mon Sep 17 00:00:00 2001
From: Zeno Albisser <zeno.albisser@digia.com>
Date: Mon, 28 Oct 2013 10:59:26 +0100
Subject: 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>
---
 .../libjingle/source/talk/media/webrtc/webrtcvoiceengine.cc | 13 -------------
 .../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);
-- 
cgit v1.2.1