bug 829288 - fix warnings under browser/ r=gavin
authorTrevor Saunders <trev.saunders@gmail.com>
Thu, 10 Jan 2013 07:34:58 -0500
changeset 118486 deab61ea49b612ee87b3f0b4da27a4a82e91f7d0
parent 118485 eaab0e962e4d4e38bfba418b67e8a66cc69a0572
child 118487 5a88ed3a3ace65a94211cbf5630df951cb50ae23
push id24166
push userMs2ger@gmail.com
push dateFri, 11 Jan 2013 13:57:41 +0000
treeherdermozilla-central@63c4b0f66a0c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgavin
bugs829288
milestone21.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 829288 - fix warnings under browser/ r=gavin
browser/components/migration/src/nsIEHistoryEnumerator.h
browser/components/shell/src/nsWindowsShellService.cpp
--- a/browser/components/migration/src/nsIEHistoryEnumerator.h
+++ b/browser/components/migration/src/nsIEHistoryEnumerator.h
@@ -2,21 +2,22 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef iehistoryenumerator___h___
 #define iehistoryenumerator___h___
 
 #include <urlhist.h>
 
+#include "mozilla/Attributes.h"
 #include "nsISimpleEnumerator.h"
 #include "nsIWritablePropertyBag2.h"
 #include "nsAutoPtr.h"
 
-class nsIEHistoryEnumerator : public nsISimpleEnumerator
+class nsIEHistoryEnumerator MOZ_FINAL : public nsISimpleEnumerator
 {
 public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSISIMPLEENUMERATOR
 
   nsIEHistoryEnumerator();
 
 private:
--- a/browser/components/shell/src/nsWindowsShellService.cpp
+++ b/browser/components/shell/src/nsWindowsShellService.cpp
@@ -130,19 +130,19 @@ OpenKeyForReading(HKEY aKeyRoot, const n
 //     shell\properties                 (default)         REG_SZ     <appname> &Options
 //     shell\properties\command         (default)         REG_SZ     <apppath> -preferences
 //     shell\safemode                   (default)         REG_SZ     <appname> &Safe Mode
 //     shell\safemode\command           (default)         REG_SZ     <apppath> -safe-mode
 //
 
 // The values checked are all default values so the value name is not needed.
 typedef struct {
-  char* keyName;
-  char* valueData;
-  char* oldValueData;
+  const char* keyName;
+  const char* valueData;
+  const char* oldValueData;
 } SETTING;
 
 #define APP_REG_NAME L"Firefox"
 #define VAL_FILE_ICON "%APPPATH%,1"
 #define VAL_OPEN "\"%APPPATH%\" -osint -url \"%1\""
 #define OLD_VAL_OPEN "\"%APPPATH%\" -requestPending -osint -url \"%1\""
 #define DI "\\DefaultIcon"
 #define SOC "\\shell\\open\\command"
@@ -312,17 +312,17 @@ nsWindowsShellService::ShortcutMaintenan
 
 static bool
 IsWin8OrLater()
 {
   OSVERSIONINFOW osInfo;
   osInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFOW);
   GetVersionExW(&osInfo);
   return osInfo.dwMajorVersion > 6 || 
-         osInfo.dwMajorVersion >= 6 && osInfo.dwMinorVersion >= 2;
+         (osInfo.dwMajorVersion >= 6 && osInfo.dwMinorVersion >= 2);
 }
 
 static bool
 IsAARDefaultHTTP(IApplicationAssociationRegistration* pAAR,
                  bool* aIsDefaultBrowser)
 {
   // Make sure the Prog ID matches what we have
   LPWSTR registeredApp;