From f1a97fecbdef2d76f0b6cbdd2523bf65904e8601 Mon Sep 17 00:00:00 2001
From: "Markus F.X.J. Oberhumer" <markus@oberhumer.com>
Date: Tue, 21 Nov 2006 17:35:22 +0100
Subject: [PATCH] Minor cleanups.

---
 src/bele_policy.h     | 6 +++---
 src/compress_zlib.cpp | 2 +-
 src/mem.h             | 2 +-
 src/p_armpe.h         | 2 +-
 src/p_vxd.h           | 2 +-
 src/p_w32pe.h         | 2 +-
 src/pefile.h          | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/bele_policy.h b/src/bele_policy.h
index ebb06071..fe8205e6 100644
--- a/src/bele_policy.h
+++ b/src/bele_policy.h
@@ -53,7 +53,7 @@
 #if defined(BELE_RTP)
 struct AbstractPolicy
 {
-    explicit AbstractPolicy() {}
+    AbstractPolicy() {}
     virtual inline ~AbstractPolicy() {}
     V bool isBE() C = 0;
     V bool isLE() C = 0;
@@ -94,7 +94,7 @@ struct BEPolicy
     : public AbstractPolicy
 #endif
 {
-    explicit BEPolicy() {}
+    BEPolicy() {}
 #if defined(BELE_CTP)
     typedef N_BELE_RTP::BEPolicy RTP_Policy;
     enum { isBE = 1, isLE = 0 };
@@ -172,7 +172,7 @@ struct LEPolicy
     : public AbstractPolicy
 #endif
 {
-    explicit LEPolicy() {}
+    LEPolicy() {}
 #if defined(BELE_CTP)
     typedef N_BELE_RTP::LEPolicy RTP_Policy;
     enum { isBE = 0, isLE = 1 };
diff --git a/src/compress_zlib.cpp b/src/compress_zlib.cpp
index 7182edb3..38611fdd 100644
--- a/src/compress_zlib.cpp
+++ b/src/compress_zlib.cpp
@@ -219,7 +219,7 @@ int upx_zlib_test_overlap  ( const upx_bytep buf, unsigned src_off,
 
 const char *upx_zlib_version_string(void)
 {
-    return zlib_version;
+    return zlibVersion();
 }
 
 
diff --git a/src/mem.h b/src/mem.h
index e732d588..00373dda 100644
--- a/src/mem.h
+++ b/src/mem.h
@@ -38,7 +38,7 @@ class MemBuffer
 {
 public:
     MemBuffer();
-    MemBuffer(unsigned size);
+    explicit MemBuffer(unsigned size);
     ~MemBuffer();
 
     static unsigned getSizeForCompression(unsigned uncompressed_size, unsigned extra=0);
diff --git a/src/p_armpe.h b/src/p_armpe.h
index f0556452..9b88ff29 100644
--- a/src/p_armpe.h
+++ b/src/p_armpe.h
@@ -39,7 +39,7 @@ class PackArmPe : public PeFile
 
 public:
     PackArmPe(InputFile *f);
-    ~PackArmPe();
+    virtual ~PackArmPe();
     virtual int getFormat() const { return UPX_F_WINCE_ARM_PE; }
     virtual const char *getName() const { return "arm/pe"; }
     virtual const int *getCompressionMethods(int method, int level) const;
diff --git a/src/p_vxd.h b/src/p_vxd.h
index 4b79bf6b..a4e887fd 100644
--- a/src/p_vxd.h
+++ b/src/p_vxd.h
@@ -39,7 +39,7 @@ class PackVxd : public PackWcle
     typedef PackWcle super;
 public:
     PackVxd(InputFile *f);
-    ~PackVxd();
+    virtual ~PackVxd();
     virtual int getVersion() const { return 13; }
     virtual int getFormat() const { return UPX_F_VXD_LE; }
     virtual const char *getName() const { return "vxd/le"; }
diff --git a/src/p_w32pe.h b/src/p_w32pe.h
index 46b21013..87361f09 100644
--- a/src/p_w32pe.h
+++ b/src/p_w32pe.h
@@ -39,7 +39,7 @@ class PackW32Pe : public PeFile
 
 public:
     PackW32Pe(InputFile *f);
-    ~PackW32Pe();
+    virtual ~PackW32Pe();
     virtual int getFormat() const { return UPX_F_WIN32_PE; }
     virtual const char *getName() const { return isrtm ? "rtm32/pe" : "win32/pe"; }
     virtual const int *getCompressionMethods(int method, int level) const;
diff --git a/src/pefile.h b/src/pefile.h
index 8d4a71c7..18adf16c 100644
--- a/src/pefile.h
+++ b/src/pefile.h
@@ -43,7 +43,7 @@ protected:
     class Export;
 
     PeFile(InputFile *f);
-    ~PeFile();
+    virtual ~PeFile();
     virtual int getVersion() const { return 13; }
 
     virtual void unpack(OutputFile *fo);