From: Michael Wetherell <mike.wetherell@ntlworld.com>
Date: Mon, 11 Apr 2005 23:29:55 +0000 (+0000)
Subject: Remove workaround for link problem with versions of mingw before 3.4.2
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/3b676ed7f1a51aa787f37385a60a2b71538f41bf

Remove workaround for link problem with versions of mingw before 3.4.2


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

diff --git a/src/common/debugrpt.cpp b/src/common/debugrpt.cpp
index 7b88cb3fd9..6cc89cfd01 100644
--- a/src/common/debugrpt.cpp
+++ b/src/common/debugrpt.cpp
@@ -51,7 +51,6 @@
 #if wxUSE_ZIPSTREAM
     #include "wx/wfstream.h"
     #include "wx/zipstrm.h"
-    #include "wx/ptr_scpd.h"
 #endif // wxUSE_ZIPSTREAM
 
 WX_CHECK_BUILD_OPTIONS("wxQA")
@@ -586,10 +585,6 @@ bool wxDebugReport::DoProcess()
 
 #if wxUSE_ZIPSTREAM
 
-// leave the default name wxZipOutputStreamPtr free for users
-wxDECLARE_SCOPED_PTR(wxZipOutputStream, wxDbgZipOutputStreamPtr)
-wxDEFINE_SCOPED_PTR(wxZipOutputStream, wxDbgZipOutputStreamPtr)
-
 // ----------------------------------------------------------------------------
 // wxDebugReportCompress
 // ----------------------------------------------------------------------------
@@ -603,11 +598,7 @@ bool wxDebugReportCompress::DoProcess()
     // create the streams
     wxFileName fn(GetDirectory(), GetReportName(), _T("zip"));
     wxFFileOutputStream os(fn.GetFullPath(), _T("wb"));
-
-    // create this one on the heap as a workaround since otherwise the mingw
-    // 3.2.3 linker cannot find ~wxZipOutputStream() when building a dll
-    // version of the library.
-    wxDbgZipOutputStreamPtr zos(new wxZipOutputStream(os, 9));
+    wxZipOutputStream zos(os, 9);
 
     // add all files to the ZIP one
     wxString name, desc;
@@ -618,16 +609,16 @@ bool wxDebugReportCompress::DoProcess()
         wxZipEntry *ze = new wxZipEntry(name);
         ze->SetComment(desc);
 
-        if ( !zos->PutNextEntry(ze) )
+        if ( !zos.PutNextEntry(ze) )
             return false;
 
         wxFileName filename(fn.GetPath(), name);
         wxFFileInputStream is(filename.GetFullPath());
-        if ( !is.IsOk() || !zos->Write(is).IsOk() )
+        if ( !is.IsOk() || !zos.Write(is).IsOk() )
             return false;
     }
 
-    if ( !zos->Close() )
+    if ( !zos.Close() )
         return false;
 
     m_zipfile = fn.GetFullPath();