diff options
author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2017-06-20 11:30:21 +0300 |
---|---|---|
committer | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2017-06-20 11:32:02 +0300 |
commit | 687466ac4748c82d8a56aff3f2f5901f929a4bcd (patch) | |
tree | 426992ddc3e43b5d5522a781065287beaee5e0a0 /src/plugins/cppeditor/cppinsertvirtualmethods.cpp | |
parent | f047e1a2a2ac6667d7d19c95e3f6bb96e17f2a5a (diff) | |
parent | b89888ca9d6d10c850619c726e38584ca6637578 (diff) |
Merge remote-tracking branch 'origin/4.3'
Change-Id: I126f3a05212a3d5df78812e66285bc9e8078360b
Diffstat (limited to 'src/plugins/cppeditor/cppinsertvirtualmethods.cpp')
-rw-r--r-- | src/plugins/cppeditor/cppinsertvirtualmethods.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/cppeditor/cppinsertvirtualmethods.cpp b/src/plugins/cppeditor/cppinsertvirtualmethods.cpp index 2d898353b2..655803cb03 100644 --- a/src/plugins/cppeditor/cppinsertvirtualmethods.cpp +++ b/src/plugins/cppeditor/cppinsertvirtualmethods.cpp @@ -588,7 +588,8 @@ public: for (Scope::iterator it = clazz->memberBegin(); it != clazz->memberEnd(); ++it) { if (const Function *func = (*it)->type()->asFunctionType()) { // Filter virtual destructors - if (func->name()->asDestructorNameId()) + const Name *name = func->name(); + if (!name || name->asDestructorNameId()) continue; const Function *firstVirtual = 0; |