From 031199ebd3d5fc475c2d456e4dc0074778c7efe2 Mon Sep 17 00:00:00 2001
From: "jwalden%mit.edu" <jwalden%mit.edu@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Mon, 2 Jul 2007 23:46:19 +0000
Subject: [PATCH] Fix up three uses of NS_STATIC_CAST which can't be
 automatically converted to static_cast<> due to a deficiency in the fixup
 script.

git-svn-id: svn://10.0.0.236/trunk@229203 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/docshell/base/nsDocShell.cpp       | 8 +++-----
 mozilla/extensions/wallet/src/singsign.cpp | 4 ++--
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/mozilla/docshell/base/nsDocShell.cpp b/mozilla/docshell/base/nsDocShell.cpp
index 36d2ba5dc79..90e5b0593fe 100644
--- a/mozilla/docshell/base/nsDocShell.cpp
+++ b/mozilla/docshell/base/nsDocShell.cpp
@@ -5874,9 +5874,8 @@ nsDocShell::NewContentViewerObj(const char *aContentType,
     NS_ENSURE_SUCCESS(docLoaderFactory->CreateInstance("view",
                                                        aOpenedChannel,
                                                        aLoadGroup, aContentType,
-                                                       NS_STATIC_CAST
-                                                       (nsIContentViewerContainer
-                                                        *, this), nsnull,
+                                                       static_cast<nsIContentViewerContainer*>(this),
+                                                       nsnull,
                                                        aContentHandler,
                                                        aViewer),
                       NS_ERROR_FAILURE);
@@ -8479,8 +8478,7 @@ nsDocShell::EnsureScriptEnvironment()
     nsCOMPtr<nsPIDOMWindow> win(do_QueryInterface(mScriptGlobal));
     win->SetDocShell(NS_STATIC_CAST(nsIDocShell *, this));
     mScriptGlobal->
-        SetGlobalObjectOwner(NS_STATIC_CAST
-                             (nsIScriptGlobalObjectOwner *, this));
+        SetGlobalObjectOwner(static_cast<nsIScriptGlobalObjectOwner *>(this));
 
     // Ensure the script object is set to run javascript - other languages
     // setup on demand.
diff --git a/mozilla/extensions/wallet/src/singsign.cpp b/mozilla/extensions/wallet/src/singsign.cpp
index 4fb69e46f79..df0a1edc1c3 100644
--- a/mozilla/extensions/wallet/src/singsign.cpp
+++ b/mozilla/extensions/wallet/src/singsign.cpp
@@ -3059,8 +3059,8 @@ SINGSIGN_Enumerate
   *host = (char *) nsMemory::Clone
     (hostStruct->passwordRealm, strlen(hostStruct->passwordRealm) + 1);
   NS_ENSURE_ARG_POINTER(host);
-  userStruct = NS_STATIC_CAST
-    (si_SignonUserStruct*, hostStruct->signonUser_list.ElementAt(userNumber));
+  userStruct =
+    static_cast<si_SignonUserStruct*>(hostStruct->signonUser_list.ElementAt(userNumber));
 
   /* first non-password data item for user is the username */
   PRInt32 dataCount = userStruct->signonData_list.Count();