aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 7.4.1610

Browse Source 
Problem:    Compiler warnings for non-virtual destructor.
Solution:   Mark the classe final. (Ken Takata)
This commit is contained in:
Bram Moolenaar 2016-03-19 20:51:35 +01:00
parent 4d581a826c
commit cc6cf9b9f9
4 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Make_cyg_ming.mak
View File

@ -415,6 +415,7 @@ WINDRES_CC = $(CC)
########################################################################### ###########################################################################
CFLAGS = -Iproto $(DEFINES) -pipe -march=$(ARCH) -Wall CFLAGS = -Iproto $(DEFINES) -pipe -march=$(ARCH) -Wall
CXXFLAGS = -std=c++11
WINDRES_FLAGS = --preprocessor="$(WINDRES_CC) -E -xc" -DRC_INVOKED WINDRES_FLAGS = --preprocessor="$(WINDRES_CC) -E -xc" -DRC_INVOKED
EXTRA_LIBS = EXTRA_LIBS =
@ -864,14 +865,14 @@ $(OUTDIR)/gui_w32.o: gui_w32.c $(INCL)
$(CC) -c $(CFLAGS) gui_w32.c -o $(OUTDIR)/gui_w32.o $(CC) -c $(CFLAGS) gui_w32.c -o $(OUTDIR)/gui_w32.o
$(OUTDIR)/gui_dwrite.o: gui_dwrite.cpp $(INCL) gui_dwrite.h $(OUTDIR)/gui_dwrite.o: gui_dwrite.cpp $(INCL) gui_dwrite.h
$(CC) -c $(CFLAGS) gui_dwrite.cpp -o $(OUTDIR)/gui_dwrite.o $(CC) -c $(CFLAGS) $(CXXFLAGS) gui_dwrite.cpp -o $(OUTDIR)/gui_dwrite.o
$(OUTDIR)/if_cscope.o: if_cscope.c $(INCL) if_cscope.h $(OUTDIR)/if_cscope.o: if_cscope.c $(INCL) if_cscope.h
$(CC) -c $(CFLAGS) if_cscope.c -o $(OUTDIR)/if_cscope.o $(CC) -c $(CFLAGS) if_cscope.c -o $(OUTDIR)/if_cscope.o
# Remove -D__IID_DEFINED__ for newer versions of the w32api # Remove -D__IID_DEFINED__ for newer versions of the w32api
$(OUTDIR)/if_ole.o: if_ole.cpp $(INCL) $(OUTDIR)/if_ole.o: if_ole.cpp $(INCL)
$(CC) $(CFLAGS) -c -o $(OUTDIR)/if_ole.o if_ole.cpp $(CC) $(CFLAGS) $(CXXFLAGS) -c -o $(OUTDIR)/if_ole.o if_ole.cpp
$(OUTDIR)/if_ruby.o: if_ruby.c $(INCL) $(OUTDIR)/if_ruby.o: if_ruby.c $(INCL)
ifeq (16, $(RUBY)) ifeq (16, $(RUBY))

8
src/gui_dwrite.cpp
View File

@ -33,6 +33,12 @@
# define __out SAL__out # define __out SAL__out
#endif #endif
#if (defined(_MSC_VER) && (_MSC_VER >= 1700)) || (__cplusplus >= 201103L)
# define FINAL final
#else
# define FINAL
#endif
#ifdef DYNAMIC_DIRECTX #ifdef DYNAMIC_DIRECTX
extern "C" HINSTANCE vimLoadLib(char *name); extern "C" HINSTANCE vimLoadLib(char *name);
@ -222,7 +228,7 @@ public:
} }
}; };
class GdiTextRenderer : public IDWriteTextRenderer class GdiTextRenderer FINAL : public IDWriteTextRenderer
{ {
public: public:
GdiTextRenderer( GdiTextRenderer(

10
src/if_ole.cpp
View File

@ -34,6 +34,12 @@ extern HWND s_hwnd;
extern HWND vim_parent_hwnd; extern HWND vim_parent_hwnd;
} }
#if (defined(_MSC_VER) && (_MSC_VER >= 1700)) || (__cplusplus >= 201103L)
# define FINAL final
#else
# define FINAL
#endif
#if (defined(_MSC_VER) && _MSC_VER < 1300) || !defined(MAXULONG_PTR) #if (defined(_MSC_VER) && _MSC_VER < 1300) || !defined(MAXULONG_PTR)
/* Work around old versions of basetsd.h which wrongly declares /* Work around old versions of basetsd.h which wrongly declares
* UINT_PTR as unsigned long */ * UINT_PTR as unsigned long */
@ -93,7 +99,7 @@ static CVim *app = 0;
* ---------- * ----------
*/ */
class CVim : public IVim class CVim FINAL : public IVim
{ {
public: public:
virtual ~CVim(); virtual ~CVim();
@ -428,7 +434,7 @@ CVim::Eval(BSTR expr, BSTR *result)
* ---------- * ----------
*/ */
class CVimCF : public IClassFactory class CVimCF FINAL : public IClassFactory
{ {
public: public:
static CVimCF *Create(); static CVimCF *Create();

2
src/version.c
View File

@ -748,6 +748,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1610,
/**/ /**/
1609, 1609,
/**/ /**/