From cdc5264bdb3b548fa72c919944ca330493a42488 Mon Sep 17 00:00:00 2001 From: "mcafee%netscape.com" Date: Sat, 6 Mar 1999 04:42:08 +0000 Subject: [PATCH] Directly calling const char* const() operator to avoid ambiguity on Solaris. r=mcmullen@netscape.com git-svn-id: svn://10.0.0.236/trunk@23046 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/modules/plugin/base/src/nsPluginInstancePeer.cpp | 6 +++--- mozilla/modules/plugin/nglsrc/nsPluginInstancePeer.cpp | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mozilla/modules/plugin/base/src/nsPluginInstancePeer.cpp b/mozilla/modules/plugin/base/src/nsPluginInstancePeer.cpp index 6cdaa37ef5e..311e0a12560 100644 --- a/mozilla/modules/plugin/base/src/nsPluginInstancePeer.cpp +++ b/mozilla/modules/plugin/base/src/nsPluginInstancePeer.cpp @@ -208,7 +208,7 @@ nsPluginStreamToFile::nsPluginStreamToFile(const char* target, nsIPluginInstance // construct the URL we'll use later in calls to GetURL() mFileURL = mFileSpec; - printf("File URL = %s\n", (const char*)mFileURL); + printf("File URL = %s\n", mFileURL.operator const char* const()); } nsPluginStreamToFile::~nsPluginStreamToFile() @@ -250,7 +250,7 @@ nsPluginStreamToFile::Write(const char* aBuf, PRUint32 aCount, PRUint32 *aWriteC PRUint32 actualCount; mFileThing->Write(aBuf, aCount, &actualCount); mFileThing->Close(); - mOwner->GetURL(mFileURL, mTarget, nsnull); + mOwner->GetURL(mFileURL.operator const char* const(), mTarget, nsnull); return NS_OK; } @@ -258,7 +258,7 @@ nsPluginStreamToFile::Write(const char* aBuf, PRUint32 aCount, PRUint32 *aWriteC NS_IMETHODIMP nsPluginStreamToFile::Close(void) { - mOwner->GetURL(mFileURL, mTarget, nsnull); + mOwner->GetURL(mFileURL.operator const char* const(), mTarget, nsnull); return NS_OK; } diff --git a/mozilla/modules/plugin/nglsrc/nsPluginInstancePeer.cpp b/mozilla/modules/plugin/nglsrc/nsPluginInstancePeer.cpp index 6cdaa37ef5e..311e0a12560 100644 --- a/mozilla/modules/plugin/nglsrc/nsPluginInstancePeer.cpp +++ b/mozilla/modules/plugin/nglsrc/nsPluginInstancePeer.cpp @@ -208,7 +208,7 @@ nsPluginStreamToFile::nsPluginStreamToFile(const char* target, nsIPluginInstance // construct the URL we'll use later in calls to GetURL() mFileURL = mFileSpec; - printf("File URL = %s\n", (const char*)mFileURL); + printf("File URL = %s\n", mFileURL.operator const char* const()); } nsPluginStreamToFile::~nsPluginStreamToFile() @@ -250,7 +250,7 @@ nsPluginStreamToFile::Write(const char* aBuf, PRUint32 aCount, PRUint32 *aWriteC PRUint32 actualCount; mFileThing->Write(aBuf, aCount, &actualCount); mFileThing->Close(); - mOwner->GetURL(mFileURL, mTarget, nsnull); + mOwner->GetURL(mFileURL.operator const char* const(), mTarget, nsnull); return NS_OK; } @@ -258,7 +258,7 @@ nsPluginStreamToFile::Write(const char* aBuf, PRUint32 aCount, PRUint32 *aWriteC NS_IMETHODIMP nsPluginStreamToFile::Close(void) { - mOwner->GetURL(mFileURL, mTarget, nsnull); + mOwner->GetURL(mFileURL.operator const char* const(), mTarget, nsnull); return NS_OK; }