Bug 797316 - Fix -Werror=conversion-null errors in Windows-only code (toolkit/components/parentalcontrols part) r=netzen
authorJacek Caban <jacek@codeweavers.com>
Thu, 04 Oct 2012 10:30:42 +0200
changeset 109335 37046745e7426ce71e48228d91ca4eed9037ba48
parent 109334 64ac66fde0afa8721692dc8f65efb882dc301307
child 109336 8913d486d3f4a87a84a898b3d6d4f3f33203e870
push id82
push usershu@rfrn.org
push dateFri, 05 Oct 2012 13:20:22 +0000
reviewersnetzen
bugs797316
milestone18.0a1
Bug 797316 - Fix -Werror=conversion-null errors in Windows-only code (toolkit/components/parentalcontrols part) r=netzen
toolkit/components/parentalcontrols/nsParentalControlsServiceWin.cpp
--- a/toolkit/components/parentalcontrols/nsParentalControlsServiceWin.cpp
+++ b/toolkit/components/parentalcontrols/nsParentalControlsServiceWin.cpp
@@ -36,19 +36,19 @@ typedef ULONG (STDMETHODCALLTYPE *MyEven
 typedef ULONG (STDMETHODCALLTYPE *MyEventUnregister)(
   REGHANDLE RegHandle);
 
 MyEventWrite gEventWrite = NULL;
 MyEventRegister gEventRegister = NULL;
 MyEventUnregister gEventUnregister = NULL;
 
 nsParentalControlsServiceWin::nsParentalControlsServiceWin() :
-  mPC(nullptr)
-, mEnabled(false)
-, mProvider(NULL)
+  mEnabled(false)
+, mProvider(0)
+, mPC(nullptr)
 {
   HRESULT hr;
   CoInitialize(NULL);
   hr = CoCreateInstance(CLSID_WinParentalControls, NULL, CLSCTX_INPROC,
                         IID_IWinParentalControls, (void**)&mPC);
   if (FAILED(hr))
     return;