ambiguous ctor call resolved

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3709 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/fs_inet.cpp b/src/common/fs_inet.cpp
index dfbc0089657337d7f23ac70f3926b4ef17e1525c..3af1151d62712478818b94ccf53136252311a2ca 100644 (file)
--- a/src/common/fs_inet.cpp
+++ b/src/common/fs_inet.cpp
@@ -90,7 +90,7 @@ wxFSFile* wxInternetFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxStri
         content = url.GetProtocol().GetContentType();
         if (content == wxEmptyString) content = GetMimeTypeFromExt(location);
         if (s)
         content = url.GetProtocol().GetContentType();
         if (content == wxEmptyString) content = GetMimeTypeFromExt(location);
         if (s)

-       {
+        {

             wxChar buf[256];
 
             wxGetTempFileName( _T("wxhtml"), buf);
             wxChar buf[256];
 
             wxGetTempFileName( _T("wxhtml"), buf);


@@ -98,12 +98,7 @@ wxFSFile* wxInternetFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxStri
             m_Cache.Put(right, info);
 
             {   // ok, now copy it:
             m_Cache.Put(right, info);
 
             {   // ok, now copy it:

-#if defined(__VISAGECPP__)
-// VA thinks this is an ambiguous call
-                wxFileOutputStream sout((wxString)buf);
-#else
-                wxFileOutputStream sout(buf);
-#endif
+                wxFileOutputStream sout(wxString(buf));

                 s -> Read(sout); // copy the stream
             }
             delete s;
                 s -> Read(sout); // copy the stream
             }
             delete s;