Mercurial > vim

comparison src/if_ole.cpp @ 8641:0af716a4f5d2 v7.4.1610

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit https://github.com/vim/vim/commit/cc6cf9b9f9045a7d8b5923ea0c556e9a4c2567d3 Author: Bram Moolenaar <Bram@vim.org> Date: Sat Mar 19 20:51:35 2016 +0100 patch 7.4.1610 Problem: Compiler warnings for non-virtual destructor. Solution: Mark the classe final. (Ken Takata)
author Christian Brabandt <cb@256bit.org>
date Sat, 19 Mar 2016 21:00:04 +0100
parents d2a215e8d5b4
children 4aead6a9b7a9
comparison
equal deleted inserted replaced
8640:51b3ead7e4da 8641:0af716a4f5d2
32 #endif 32 #endif
33 extern HWND s_hwnd; 33 extern HWND s_hwnd;
34 extern HWND vim_parent_hwnd; 34 extern HWND vim_parent_hwnd;
35 } 35 }
36 36
37 #if (defined(_MSC_VER) && (_MSC_VER >= 1700)) || (__cplusplus >= 201103L)
38 # define FINAL final
39 #else
40 # define FINAL
41 #endif
42
37 #if (defined(_MSC_VER) && _MSC_VER < 1300) || !defined(MAXULONG_PTR) 43 #if (defined(_MSC_VER) && _MSC_VER < 1300) || !defined(MAXULONG_PTR)
38 /* Work around old versions of basetsd.h which wrongly declares 44 /* Work around old versions of basetsd.h which wrongly declares
39 * UINT_PTR as unsigned long */ 45 * UINT_PTR as unsigned long */
40 # undef UINT_PTR 46 # undef UINT_PTR
41 # define UINT_PTR UINT 47 # define UINT_PTR UINT
91 97
92 /* Definition 98 /* Definition
93 * ---------- 99 * ----------
94 */ 100 */
95 101
96 class CVim : public IVim 102 class CVim FINAL : public IVim
97 { 103 {
98 public: 104 public:
99 virtual ~CVim(); 105 virtual ~CVim();
100 static CVim *Create(int *pbDoRestart); 106 static CVim *Create(int *pbDoRestart);
101 107
426 432
427 /* Definition 433 /* Definition
428 * ---------- 434 * ----------
429 */ 435 */
430 436
431 class CVimCF : public IClassFactory 437 class CVimCF FINAL : public IClassFactory
432 { 438 {
433 public: 439 public:
434 static CVimCF *Create(); 440 static CVimCF *Create();
435 virtual ~CVimCF() {}; 441 virtual ~CVimCF() {};
436 442