Bug 1615769 - Move `using namespace mozilla` in order to resolve conflicts with Windows headers. r=saschanaz
authorMasatoshi Kimura <VYV03354@nifty.ne.jp>
Sat, 15 Feb 2020 05:57:58 +0000
changeset 514169 3ff6c746997a57a551c5e40d5d28ca069328e716
parent 514168 4cb9c9f05b9005a79aa87ae971fd11d448878a76
child 514170 02b1aa498dd2269ea45fb47e7e50f3d45d26bd3c
child 514171 69ee7198e3667bc0fbb6e7ed882c654c59ef795a
push id37125
push usershindli@mozilla.com
push dateSat, 15 Feb 2020 09:56:17 +0000
treeherdermozilla-central@02b1aa498dd2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssaschanaz
bugs1615769
milestone75.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 1615769 - Move `using namespace mozilla` in order to resolve conflicts with Windows headers. r=saschanaz Differential Revision: https://phabricator.services.mozilla.com/D62989
widget/windows/WindowsUIUtils.cpp
--- a/widget/windows/WindowsUIUtils.cpp
+++ b/widget/windows/WindowsUIUtils.cpp
@@ -20,18 +20,16 @@
 #include "mozilla/media/MediaUtils.h"
 #include "nsString.h"
 #include "nsIWidget.h"
 #include "nsIWindowMediator.h"
 #include "nsPIDOMWindow.h"
 #include "nsWindowGfx.h"
 #include "Units.h"
 
-using namespace mozilla;
-
 /* mingw currently doesn't support windows.ui.viewmanagement.h, so we disable it
  * until it's fixed. */
 #ifndef __MINGW32__
 
 #  include <windows.ui.viewmanagement.h>
 
 #  pragma comment(lib, "runtimeobject.lib")
 
@@ -127,16 +125,18 @@ IDataPackage4 : public IInspectable {
   virtual HRESULT STDMETHODCALLTYPE remove_ShareCanceled(
       EventRegistrationToken token) = 0;
 };
 
 #  endif
 
 #endif
 
+using namespace mozilla;
+
 WindowsUIUtils::WindowsUIUtils() : mInTabletMode(eTabletModeUnknown) {}
 
 WindowsUIUtils::~WindowsUIUtils() {}
 
 /*
  * Implement the nsISupports methods...
  */
 NS_IMPL_ISUPPORTS(WindowsUIUtils, nsIWindowsUIUtils)