From fbeb97e01f02a528cce02f076942a779195270a5 Mon Sep 17 00:00:00 2001 From: perkj Date: Fri, 8 Jan 2016 00:43:07 -0800 Subject: [PATCH] Fix clang warning in peerconnection_jni.cc TEST= export GYP_DEFINES="OS=android clang=1" ... ninja -C out/Debug AppRTCDemo BUG=webrtc:5399 Review URL: https://codereview.webrtc.org/1561073005 Cr-Commit-Position: refs/heads/master@{#11181} --- talk/app/webrtc/java/jni/peerconnection_jni.cc | 6 +++--- talk/libjingle.gyp | 7 ------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/talk/app/webrtc/java/jni/peerconnection_jni.cc b/talk/app/webrtc/java/jni/peerconnection_jni.cc index 475748409c..5e90043c3f 100644 --- a/talk/app/webrtc/java/jni/peerconnection_jni.cc +++ b/talk/app/webrtc/java/jni/peerconnection_jni.cc @@ -547,7 +547,7 @@ class SdpObserverWrapper : public T { protected: // Common implementation for failure of Set & Create types, distinguished by // |op| being "Set" or "Create". - void OnFailure(const std::string& op, const std::string& error) { + void DoOnFailure(const std::string& op, const std::string& error) { jmethodID m = GetMethodID(jni(), *j_observer_class_, "on" + op + "Failure", "(Ljava/lang/String;)V"); jstring j_error_string = JavaStringFromStdString(jni(), error); @@ -574,7 +574,7 @@ class CreateSdpObserverWrapper void OnFailure(const std::string& error) override { ScopedLocalRefFrame local_ref_frame(jni()); - SdpObserverWrapper::OnFailure(std::string("Create"), error); + SdpObserverWrapper::DoOnFailure(std::string("Create"), error); } }; @@ -587,7 +587,7 @@ class SetSdpObserverWrapper void OnFailure(const std::string& error) override { ScopedLocalRefFrame local_ref_frame(jni()); - SdpObserverWrapper::OnFailure(std::string("Set"), error); + SdpObserverWrapper::DoOnFailure(std::string("Set"), error); } }; diff --git a/talk/libjingle.gyp b/talk/libjingle.gyp index 04da73f687..bc7c0b4ed3 100755 --- a/talk/libjingle.gyp +++ b/talk/libjingle.gyp @@ -62,13 +62,6 @@ '<(libyuv_dir)/include', ], 'conditions': [ - ['clang==1', { - 'cflags': [ - # Disabled due to failing when compiled with -Wall, see - # https://bugs.chromium.org/p/webrtc/issues/detail?id=5399 - '-Wno-overloaded-virtual', - ], - }], ['OS=="linux"', { 'defines': [ 'HAVE_GTK',