Bug 1369992 - Make GetNative as public for clang. r=jolin
authorMakoto Kato <m_kato@ga2.so-net.ne.jp>
Sat, 03 Jun 2017 21:09:58 +0900
changeset 410562 ff48915ee1d850708c528d310a2598f470b7bf02
parent 410561 df3950d5ce913d4f5ddaf6a674296263decc2da7
child 410563 46b6257d29c1f898540ce9453bfb791c50b738b1
push id7391
push usermtabara@mozilla.com
push dateMon, 12 Jun 2017 13:08:53 +0000
treeherdermozilla-beta@2191d7f87e2e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjolin
bugs1369992
milestone55.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 1369992 - Make GetNative as public for clang. r=jolin When building Fennec using clang, the following build error occurs. 0:17.02 /mozilla/mobile/media/webrtc/signaling/src/media-conduit/WebrtcMediaCodecVP8VideoCodec.cpp:1099:27: error: 'GetNative' is a protected member of 'mozilla::jni::NativeImpl<mozilla::java::CodecProxy::NativeCallbacks, mozilla::JavaCallbacksSupport>' 0:17.02 JavaCallbacksSupport::GetNative(mJavaCallbacks)->Cancel(); 0:17.02 ^ 0:17.02 /mozilla/objdir-android/dist/include/mozilla/jni/Natives.h:821:18: note: declared protected here 0:17.02 static Impl* GetNative(const typename Cls::LocalRef& instance) { 0:17.02 ^ We should define GetNative as public into JavaCallbacksSupport.h. MozReview-Commit-ID: DYEyB2dRK8y
dom/media/platforms/android/JavaCallbacksSupport.h
--- a/dom/media/platforms/android/JavaCallbacksSupport.h
+++ b/dom/media/platforms/android/JavaCallbacksSupport.h
@@ -12,16 +12,17 @@
 namespace mozilla {
 
 class JavaCallbacksSupport
   : public java::CodecProxy::NativeCallbacks::Natives<JavaCallbacksSupport>
 {
 public:
   typedef java::CodecProxy::NativeCallbacks::Natives<JavaCallbacksSupport> Base;
   using Base::AttachNative;
+  using Base::GetNative;
   using Base::DisposeNative;
 
   JavaCallbacksSupport() : mCanceled(false) { }
 
   virtual ~JavaCallbacksSupport() { }
 
   virtual void HandleInput(int64_t aTimestamp, bool aProcessed) = 0;