From: Bram Moolenaar Date: Sat, 27 Feb 2016 20:59:51 +0000 (+0100) Subject: patch 7.4.1442 X-Git-Tag: v7.4.1442 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e0fd2aa8f6544f9cf8286c707be3fb1c66c609e6;p=thirdparty%2Fvim.git patch 7.4.1442 Problem: MS-Windows: more compilation warnings for destructor. Solution: Add "virtual". (Ken Takata) --- diff --git a/src/if_ole.cpp b/src/if_ole.cpp index aabf6bb84b..a93abe0a85 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 505d1701d5..a1e54427af 100644 --- a/src/version.c +++ b/src/version.c @@ -743,6 +743,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1442, /**/ 1441, /**/