summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-02-27 15:27:23 +0100
committerBram Moolenaar <Bram@vim.org>2016-02-27 15:27:23 +0100
commitedb4f2b3601b0abd47091606269c0ac3244a805b (patch)
treeb293e5bde3303dfbe7ff03628eb777662220f75f
parent43acbce1bb0a33edc67496b220cae629ad95d2d8 (diff)
downloadvim-git-edb4f2b3601b0abd47091606269c0ac3244a805b.tar.gz
patch 7.4.1428v7.4.1428
Problem: Compiler warning for non-virtual destructor. Solution: Make it virtual. (Yasuhiro Matsumoto)
-rw-r--r--src/gui_dwrite.cpp5
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 2 deletions
diff --git a/src/gui_dwrite.cpp b/src/gui_dwrite.cpp
index 08b81c447..07685eb09 100644
--- a/src/gui_dwrite.cpp
+++ b/src/gui_dwrite.cpp
@@ -237,7 +237,8 @@ public:
AddRef();
}
- ~GdiTextRenderer()
+ // add "virtual" to avoid a compiler warning
+ virtual ~GdiTextRenderer()
{
SafeRelease(&pRenderTarget_);
SafeRelease(&pRenderingParams_);
@@ -255,7 +256,7 @@ public:
__maybenull void* clientDrawingContext,
__out DWRITE_MATRIX* transform)
{
- //forward the render target's transform
+ // forward the render target's transform
pRenderTarget_->GetCurrentTransform(transform);
return S_OK;
}
diff --git a/src/version.c b/src/version.c
index 359d8df3b..68ccf9280 100644
--- a/src/version.c
+++ b/src/version.c
@@ -749,6 +749,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1428,
+/**/
1427,
/**/
1426,