Bug 1373525 - webrtc: Remove unused member function in WrappableJSErrorResult. r=bwc
authorChris Peterson <cpeterson@mozilla.com>
Mon, 12 Jun 2017 21:43:29 -0700
changeset 414161 2b84935584befd2f613d161678537c1832c2ed5a
parent 414160 6ad111c8d77e537c432b6be11547026557c83dc8
child 414162 1c091b62022cf895635b10fad4c71445a4f5637d
push id7566
push usermtabara@mozilla.com
push dateWed, 02 Aug 2017 08:25:16 +0000
treeherdermozilla-beta@86913f512c3c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbwc
bugs1373525
milestone56.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1373525 - webrtc: Remove unused member function in WrappableJSErrorResult. r=bwc media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp:181:3 [-Wunused-member-function] unused member function 'operator (anonymous namespace)::JSErrorResult &' And suppress -Wcomma warnings in upstream webrtc code: media/webrtc/trunk/webrtc/modules/audio_coding/neteq/background_noise.h:98:22: warning: possible misuse of comma operator here [-Wcomma] media/webrtc/trunk/webrtc/modules/desktop_capture/differ_unittest.cc:187:22: warning: possible misuse of comma operator here [-Wcomma] MozReview-Commit-ID: FVecnczsWk7
media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp
media/webrtc/trunk/gtest/moz.build
--- a/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp
+++ b/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp
@@ -173,22 +173,22 @@ public:
   WrappableJSErrorResult(const WrappableJSErrorResult &other)
     : mRv(MakeUnique<JSErrorResult>()),
       isCopy(true) {}
   ~WrappableJSErrorResult() {
     if (isCopy) {
       MOZ_ASSERT(NS_IsMainThread());
     }
   }
-  operator JSErrorResult &() { return *mRv; }
   operator ErrorResult &() { return *mRv; }
 private:
   mozilla::UniquePtr<JSErrorResult> mRv;
   bool isCopy;
 };
+
 }
 
 static nsresult InitNSSInContent()
 {
   NS_ENSURE_TRUE(NS_IsMainThread(), NS_ERROR_NOT_SAME_THREAD);
 
   if (!XRE_IsContentProcess()) {
     MOZ_ASSERT_UNREACHABLE("Must be called in content process");
--- a/media/webrtc/trunk/gtest/moz.build
+++ b/media/webrtc/trunk/gtest/moz.build
@@ -558,16 +558,18 @@ if CONFIG['OS_TARGET'] in ['Darwin', 'Li
     ]
 
     if CONFIG['GNU_CXX']:
         CXXFLAGS += [
             '-Wno-error=shadow',
             '-Wno-inconsistent-missing-override',
             '-Wno-overloaded-virtual',
         ]
+        if CONFIG['CLANG_CXX']:
+            CXXFLAGS += ['-Wno-comma']
 
     if CONFIG['_MSC_VER']:
         # This is intended as a temporary workaround to enable warning free building
         # with VS2015.
         # reinterpret_cast': conversion from 'DWORD' to 'HANDLE' of greater size
         CXXFLAGS += ['-wd4312']
 
     Program('webrtc-gtest')