summaryrefslogtreecommitdiff
path: root/voice_engine/voice_engine_impl.h
diff options
context:
space:
mode:
authortommi@webrtc.org <tommi@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>2013-02-15 15:07:32 +0000
committertommi@webrtc.org <tommi@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>2013-02-15 15:07:32 +0000
commitb9e5a3d589349ee55e41cb54eca4ec822018f5c5 (patch)
treefafc67d55c5277257678501ef63cd23e1ae14ec4 /voice_engine/voice_engine_impl.h
parent4e91d4a457f13f2e4f1647e8b5277b08972b854f (diff)
downloadwebrtc-b9e5a3d589349ee55e41cb54eca4ec822018f5c5.tar.gz
Make VoiceEngineImpl inherit from VoiceEngine.
This associates the two types instead of incorrectly reinterpret casting VoiceEngineImpl* to VoiceEngine* (since these types were previously unrelated). Please see more details in the bug for how this is currently causing problems with security tools. BUG=38612 Review URL: https://webrtc-codereview.appspot.com/1099013 git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@3520 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'voice_engine/voice_engine_impl.h')
-rw-r--r--voice_engine/voice_engine_impl.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/voice_engine/voice_engine_impl.h b/voice_engine/voice_engine_impl.h
index 7db77be6..2b3963cd 100644
--- a/voice_engine/voice_engine_impl.h
+++ b/voice_engine/voice_engine_impl.h
@@ -59,6 +59,7 @@ namespace webrtc
{
class VoiceEngineImpl : public voe::SharedData, // Must be the first base class
+ public VoiceEngine,
#ifdef WEBRTC_VOICE_ENGINE_AUDIO_PROCESSING_API
public VoEAudioProcessingImpl,
#endif