admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix clang warning in peerconnection_jni.cc

Browse Source 
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}
This commit is contained in:
perkj 2016-01-08 00:43:07 -08:00 committed by Commit bot
parent 59bac1a4c5
commit fbeb97e01f
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
talk/app/webrtc/java/jni/peerconnection_jni.cc
View File

@ -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);
}
};

7
talk/libjingle.gyp
View File

@ -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',