summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-02-27 21:59:51 +0100
committerBram Moolenaar <Bram@vim.org>2016-02-27 21:59:51 +0100
commite0fd2aa8f6544f9cf8286c707be3fb1c66c609e6 (patch)
tree57bef15801c720d42696adb5cba5b6effdba69fe
parente26643e6bcd6c6c42f5eae78cee2e7950cd3f629 (diff)
downloadvim-git-e0fd2aa8f6544f9cf8286c707be3fb1c66c609e6.tar.gz
patch 7.4.1442v7.4.1442
Problem: MS-Windows: more compilation warnings for destructor. Solution: Add "virtual". (Ken Takata)
-rw-r--r--src/if_ole.cpp3
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/if_ole.cpp b/src/if_ole.cpp
index aabf6bb84..a93abe0a8 100644
--- a/src/if_ole.cpp
+++ b/src/if_ole.cpp
@@ -96,7 +96,7 @@ static CVim *app = 0;
class CVim : public IVim
{
public:
- ~CVim();
+ virtual ~CVim();
static CVim *Create(int *pbDoRestart);
// IUnknown members
@@ -432,6 +432,7 @@ class CVimCF : public IClassFactory
{
public:
static CVimCF *Create();
+ virtual ~CVimCF() {};
STDMETHOD(QueryInterface)(REFIID riid, void ** ppv);
STDMETHOD_(unsigned long, AddRef)(void);
diff --git a/src/version.c b/src/version.c
index 505d1701d..a1e54427a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -744,6 +744,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1442,
+/**/
1441,
/**/
1440,