Bug 1369992 - Make GetNative as public for clang. r?jolin draft
authorMakoto Kato <m_kato@ga2.so-net.ne.jp>
Sat, 03 Jun 2017 21:09:58 +0900
changeset 588600 d65dcc17b3aeb36eb35bd263ff6ba936724f2bce
parent 588564 43039280fe464869428f03b047bb7c762784f44b
child 631631 763da42dedfd3f6b3936262d504bdab30d6055d2
push id62099
push userbmo:m_kato@ga2.so-net.ne.jp
push dateSat, 03 Jun 2017 12:12:04 +0000
reviewersjolin
bugs1369992
milestone55.0a1
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;