From bf85eabd236e842f29d52d049c804740c5b9370b Mon Sep 17 00:00:00 2001 From: "dmose%netscape.com" Date: Sat, 4 Aug 2001 21:13:03 +0000 Subject: [PATCH] 2nd try at appeasing GCC 2.7.2 and thus fix Solaris build bustage, this time using .get() --- mailnews/addrbook/src/nsAbDirectoryQuery.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mailnews/addrbook/src/nsAbDirectoryQuery.cpp b/mailnews/addrbook/src/nsAbDirectoryQuery.cpp index a854204a17ff..c0f6acdb0193 100644 --- a/mailnews/addrbook/src/nsAbDirectoryQuery.cpp +++ b/mailnews/addrbook/src/nsAbDirectoryQuery.cpp @@ -677,10 +677,10 @@ nsresult nsAbDirectoryQuery::matchCardCondition (nsIAbCard* card, *matchFound = PR_TRUE; break; case nsIAbBooleanConditionTypes::Contains: - *matchFound = value.Find (NS_STATIC_CAST(const nsString, matchValue), PR_TRUE) >= 0; + *matchFound = value.Find (matchValue.get(), PR_TRUE) >= 0; break; case nsIAbBooleanConditionTypes::DoesNotContain: - *matchFound = value.Find (NS_STATIC_CAST(const nsString, matchValue), PR_TRUE) < 0; + *matchFound = value.Find (matchValue.get(), PR_TRUE) < 0; break; case nsIAbBooleanConditionTypes::Is: *matchFound = value.CompareWithConversion (matchValue, PR_TRUE) == 0; @@ -689,7 +689,7 @@ nsresult nsAbDirectoryQuery::matchCardCondition (nsIAbCard* card, *matchFound = value.CompareWithConversion (matchValue, PR_TRUE) != 0; break; case nsIAbBooleanConditionTypes::BeginsWith: - *matchFound = value.Find (NS_STATIC_CAST(const nsString, matchValue), PR_TRUE) == 0; + *matchFound = value.Find (matchValue.get(), PR_TRUE) == 0; break; case nsIAbBooleanConditionTypes::LessThan: *matchFound = value.CompareWithConversion (matchValue, PR_TRUE) < 0; @@ -708,7 +708,7 @@ nsresult nsAbDirectoryQuery::matchCardCondition (nsIAbCard* card, break; } - *matchFound = value.Find (NS_STATIC_CAST(const nsString, matchValue), PR_TRUE, vl - mvl) == (vl - mvl); + *matchFound = value.Find (matchValue.get(), PR_TRUE, vl - mvl) == (vl - mvl); break; } case nsIAbBooleanConditionTypes::SoundsLike: