From 0fe8548303a6fe3b43f00908e93921a9081f7652 Mon Sep 17 00:00:00 2001 From: deadbeef Date: Wed, 1 Jun 2016 13:42:32 -0700 Subject: [PATCH] Fixing overloaded-virtual compiler warning. NOTRY=True TBR=glaznev@webrtc.org Review-Url: https://codereview.webrtc.org/2023413002 Cr-Commit-Position: refs/heads/master@{#12998} --- webrtc/api/java/jni/peerconnection_jni.cc | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/webrtc/api/java/jni/peerconnection_jni.cc b/webrtc/api/java/jni/peerconnection_jni.cc index 091b9d3307..0dc9b5e316 100644 --- a/webrtc/api/java/jni/peerconnection_jni.cc +++ b/webrtc/api/java/jni/peerconnection_jni.cc @@ -160,6 +160,13 @@ class ConstraintsWrapper; // and dispatches C++ callbacks to Java. class PCOJava : public PeerConnectionObserver { public: + // We need these using declarations because there are two versions of each of + // the below methods and we only override one of them. + // TODO(deadbeef): Remove once there's only one version of the methods. + using PeerConnectionObserver::OnAddStream; + using PeerConnectionObserver::OnRemoveStream; + using PeerConnectionObserver::OnDataChannel; + PCOJava(JNIEnv* jni, jobject j_observer) : j_observer_global_(jni, j_observer), j_observer_class_(jni, GetObjectClass(jni, *j_observer_global_)),