Bug 1528651 - Followup to fix a warning on release or beta. r=aklotz
authorMasatoshi Kimura <VYV03354@nifty.ne.jp>
Sat, 23 Feb 2019 06:58:07 +0900
changeset 519757 9ce3a685bbcd0901128dab0c7261ae00dd209381
parent 519756 535b72af7ed8161582fb3a84f88689639c177435
child 519758 a8fafeb134457ed0fd12e2d38dba3fc00eaf6cae
push id10862
push userffxbld-merge
push dateMon, 11 Mar 2019 13:01:11 +0000
treeherdermozilla-beta@a2e7f5c935da [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersaklotz
bugs1528651
milestone67.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 1528651 - Followup to fix a warning on release or beta. r=aklotz
ipc/mscom/ActivationContext.cpp
--- a/ipc/mscom/ActivationContext.cpp
+++ b/ipc/mscom/ActivationContext.cpp
@@ -192,17 +192,20 @@ ActivationContextRegion& ActivationConte
   return *this;
 }
 
 void ActivationContextRegion::Activate() {
   if (mActCtx.mActCtx == INVALID_HANDLE_VALUE) {
     return;
   }
 
-  BOOL activated = ::ActivateActCtx(mActCtx.mActCtx, &mActCookie);
+#ifdef MOZ_DIAGNOSTIC_ASSERT_ENABLED
+  BOOL activated =
+#endif
+    ::ActivateActCtx(mActCtx.mActCtx, &mActCookie);
   MOZ_DIAGNOSTIC_ASSERT(activated);
 }
 
 bool ActivationContextRegion::Deactivate() {
   if (!mActCookie) {
     return true;
   }