Bug 1142495 - Fix ICC build error on emulator L. r=hsinyi
authorEdgar Chen <echen@mozilla.com>
Thu, 12 Mar 2015 23:55:50 +0800
changeset 233506 9379160419158cec5b8657620c8ebfa9fef44926
parent 233505 ae105bf20177db5ba1dd240f84ac626ae2a4eff2
child 233507 6c311023dcabbea2d89401f9a11dce3c1e4e8fd0
push id28414
push userryanvm@gmail.com
push dateFri, 13 Mar 2015 16:15:53 +0000
treeherdermozilla-central@1722c4635fac [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewershsinyi
bugs1142495
milestone39.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 1142495 - Fix ICC build error on emulator L. r=hsinyi
dom/icc/Icc.cpp
dom/icc/Icc.h
--- a/dom/icc/Icc.cpp
+++ b/dom/icc/Icc.cpp
@@ -65,16 +65,20 @@ Icc::Icc(nsPIDOMWindow* aWindow, long aC
 
   // Not being able to acquire the provider isn't fatal since we check
   // for it explicitly below.
   if (!mProvider) {
     NS_WARNING("Could not acquire nsIIccProvider!");
   }
 }
 
+Icc::~Icc()
+{
+}
+
 void
 Icc::Shutdown()
 {
   mIccInfo.SetNull();
   mProvider = nullptr;
   mLive = false;
 }
 
--- a/dom/icc/Icc.h
+++ b/dom/icc/Icc.h
@@ -106,17 +106,17 @@ public:
   GetServiceState(IccService aService, ErrorResult& aRv);
 
   IMPL_EVENT_HANDLER(iccinfochange)
   IMPL_EVENT_HANDLER(cardstatechange)
   IMPL_EVENT_HANDLER(stkcommand)
   IMPL_EVENT_HANDLER(stksessionend)
 
 private:
-  ~Icc() {}
+  ~Icc();
 
   bool mLive;
   uint32_t mClientId;
   nsString mIccId;
   // mProvider is a xpcom service and will be released at shutdown, so it
   // doesn't need to be cycle collected.
   nsCOMPtr<nsIIccProvider> mProvider;
   Nullable<OwningMozIccInfoOrMozGsmIccInfoOrMozCdmaIccInfo> mIccInfo;