diff options
| author | Michael Vogt <mvo@ubuntu.com> | 2014-06-10 19:00:41 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@ubuntu.com> | 2014-06-10 19:00:41 +0200 |
| commit | afaeea148553439684e6091f282bf5a4ee5c00d6 (patch) | |
| tree | 9de4549d414a78bed64a2a20f7941695c7d6c4df /ftparchive/contents.h | |
| parent | b4278cc96fa0184b4f522e2bcfe82bd8eba93595 (diff) | |
| parent | eea0f3a6197dba565c5df349ed06c0a70b49b77f (diff) | |
Merge branch 'debian/sid' into ubuntu/master1.0.4ubuntu1
Conflicts:
configure.ac
debian/changelog
Diffstat (limited to 'ftparchive/contents.h')
| -rw-r--r-- | ftparchive/contents.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ftparchive/contents.h b/ftparchive/contents.h index dbbb83350..f58e3278e 100644 --- a/ftparchive/contents.h +++ b/ftparchive/contents.h @@ -85,8 +85,8 @@ class ContentsExtract : public pkgDirStream bool TakeContents(const void *Data,unsigned long long Length); void Add(GenContents &Contents,std::string const &Package); - ContentsExtract() : Data(0), MaxSize(0), CurSize(0) {}; - virtual ~ContentsExtract() {delete [] Data;}; + ContentsExtract(); + virtual ~ContentsExtract(); }; #endif |