BUG: [ 906467 ] Link error with Visual Studio 2003 - Fix submitted by hberni

diff --git a/ArchiveSupport/Merge7z/Merge7z.h b/ArchiveSupport/Merge7z/Merge7z.h
index 6b3fd87..bdb0f5c 100755 (executable)
--- a/ArchiveSupport/Merge7z/Merge7z.h
+++ b/ArchiveSupport/Merge7z/Merge7z.h
@@ -38,7 +38,7 @@ interface Merge7z
                                        CheckIfPresent = 128,
                                        NeedFindFile = Attributes|CreationTime|LastAccessTime|LastWriteTime|Size|Name
                                };
-                       } *operator->();
+                       } *operator->() {return 0;}
                        UINT32 Mask;
                        UINT32 Attributes;
                        FILETIME CreationTime;

diff --git a/Src/DirActions.cpp b/Src/DirActions.cpp
index b128db8..2e3987b 100644 (file)
--- a/Src/DirActions.cpp
+++ b/Src/DirActions.cpp
@@ -411,12 +411,13 @@ void CDirView::PerformActionList(ActionList & actionList)
                                        break;
                                }
                        }
-                       catch (CMemoryException ex)
+                       catch (CMemoryException *ex)
                        {
                                bSucceed = FALSE;
                                LogErrorString(_T("CDirView::PerformActionList(): ")
                                        _T("Adding files to buffer failed!"));
-                               ex.ReportError();
+                               ex->ReportError();
+                               ex->Delete();
                        }
                }
        } 

diff --git a/Src/readme.txt b/Src/readme.txt
index 94cf7c0..1e94574 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -1,6 +1,10 @@
 2004-03-11 Kimmo
  PATCH: [ 902191 ] Uninline CDiffTextBuffer functions
   Src: GhostTextBuffer.cpp MergeDoc.cpp MergeDoc.h
+ BUG: [ 906467 ] Link error with Visual Studio 2003
+  Fix submitted by hberni
+  Merge7z: Merge7z.h
+  Src: DirActions.cpp
 
 2004-03-11 WinMerge experimental release 2.1.5.14 (installer test)