ambiguous ctor call resolved
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3709 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -90,7 +90,7 @@ wxFSFile* wxInternetFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxStri
|
|||||||
content = url.GetProtocol().GetContentType();
|
content = url.GetProtocol().GetContentType();
|
||||||
if (content == wxEmptyString) content = GetMimeTypeFromExt(location);
|
if (content == wxEmptyString) content = GetMimeTypeFromExt(location);
|
||||||
if (s)
|
if (s)
|
||||||
{
|
{
|
||||||
wxChar buf[256];
|
wxChar buf[256];
|
||||||
|
|
||||||
wxGetTempFileName( _T("wxhtml"), buf);
|
wxGetTempFileName( _T("wxhtml"), buf);
|
||||||
@@ -98,12 +98,7 @@ wxFSFile* wxInternetFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxStri
|
|||||||
m_Cache.Put(right, info);
|
m_Cache.Put(right, info);
|
||||||
|
|
||||||
{ // ok, now copy it:
|
{ // ok, now copy it:
|
||||||
#if defined(__VISAGECPP__)
|
wxFileOutputStream sout(wxString(buf));
|
||||||
// VA thinks this is an ambiguous call
|
|
||||||
wxFileOutputStream sout((wxString)buf);
|
|
||||||
#else
|
|
||||||
wxFileOutputStream sout(buf);
|
|
||||||
#endif
|
|
||||||
s -> Read(sout); // copy the stream
|
s -> Read(sout); // copy the stream
|
||||||
}
|
}
|
||||||
delete s;
|
delete s;
|
||||||
|
Reference in New Issue
Block a user