From 6c9dce9b65ef333540d26c79c127028b1c5daa61 Mon Sep 17 00:00:00 2001 From: "jfrancis%netscape.com" Date: Mon, 4 Jan 1999 17:44:20 +0000 Subject: [PATCH] satisfying compiler oddities --- content/base/src/nsRange.cpp | 6 ++---- layout/base/src/nsRange.cpp | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/content/base/src/nsRange.cpp b/content/base/src/nsRange.cpp index 680de72264fe..eeea2f7ce634 100644 --- a/content/base/src/nsRange.cpp +++ b/content/base/src/nsRange.cpp @@ -129,21 +129,19 @@ PRBool nsRange::InSameDoc(nsIDOMNode* aNode1, nsIDOMNode* aNode2) PRBool retval = PR_FALSE; nsIContent *cN1 = nsnull; nsIContent *cN2 = nsnull; + nsIDocument *doc1 = nsnull; + nsIDocument *doc2 = nsnull; nsresult res = GetContentFromDOMNode(aNode1, &cN1); if (!NS_SUCCEEDED(res)) goto inSameDoc_err_label; res = GetContentFromDOMNode(aNode2, &cN2); if (!NS_SUCCEEDED(res)) goto inSameDoc_err_label; - nsIDocument *doc1 = nsnull; - nsIDocument *doc2 = nsnull; - res = cN1->GetDocument(doc1); if (!NS_SUCCEEDED(res)) goto inSameDoc_err_label; res = cN2->GetDocument(doc2); if (!NS_SUCCEEDED(res)) goto inSameDoc_err_label; - // Now compare the two documents: is direct comparison safe? if (doc1 == doc2) retval = PR_TRUE; diff --git a/layout/base/src/nsRange.cpp b/layout/base/src/nsRange.cpp index 680de72264fe..eeea2f7ce634 100644 --- a/layout/base/src/nsRange.cpp +++ b/layout/base/src/nsRange.cpp @@ -129,21 +129,19 @@ PRBool nsRange::InSameDoc(nsIDOMNode* aNode1, nsIDOMNode* aNode2) PRBool retval = PR_FALSE; nsIContent *cN1 = nsnull; nsIContent *cN2 = nsnull; + nsIDocument *doc1 = nsnull; + nsIDocument *doc2 = nsnull; nsresult res = GetContentFromDOMNode(aNode1, &cN1); if (!NS_SUCCEEDED(res)) goto inSameDoc_err_label; res = GetContentFromDOMNode(aNode2, &cN2); if (!NS_SUCCEEDED(res)) goto inSameDoc_err_label; - nsIDocument *doc1 = nsnull; - nsIDocument *doc2 = nsnull; - res = cN1->GetDocument(doc1); if (!NS_SUCCEEDED(res)) goto inSameDoc_err_label; res = cN2->GetDocument(doc2); if (!NS_SUCCEEDED(res)) goto inSameDoc_err_label; - // Now compare the two documents: is direct comparison safe? if (doc1 == doc2) retval = PR_TRUE;