diff options
| author | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-16 01:01:25 +0000 |
|---|---|---|
| committer | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-16 01:01:25 +0000 |
| commit | 20cb5f48d36abeb25bbf6cdd6a5f6debe014e8b1 (patch) | |
| tree | c8cf260017c72af1080cdbb5861f1e11a250a271 /base/task.h | |
| parent | 131a86821a98e41d363080d9d7925e514ab57869 (diff) | |
| download | chromium_src-20cb5f48d36abeb25bbf6cdd6a5f6debe014e8b1.zip chromium_src-20cb5f48d36abeb25bbf6cdd6a5f6debe014e8b1.tar.gz chromium_src-20cb5f48d36abeb25bbf6cdd6a5f6debe014e8b1.tar.bz2 | |
Give classes with virtual methods virtual protected destructors instead of implicit non-virtual public destructors.
Was originally:
Replace public nonvirtual destructors in classes with virtual members
with protected nonvirtual destructors where possible, and with
public virtual destructors where destruction of a derived class occurs.
(Excluding chrome/browser/...)
(Part 4 of http://www.gotw.ca/publications/mill18.htm
has a rationale for why public nonvirtual destructors in classes with
virtual members is dangerous.)
Patch by: Jacob Mandelson (jlmjln@gmail.com)
BUG=none
TEST=base_unittests & app_unittests
Review URL: http://codereview.chromium.org/200106
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34633 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/task.h')
| -rw-r--r-- | base/task.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/base/task.h b/base/task.h index 7c2f393..d71df20 100644 --- a/base/task.h +++ b/base/task.h @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2009 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -666,6 +666,7 @@ template <typename ReturnValue> struct CallbackWithReturnValue { class Type { public: + virtual ~Type() {} virtual ReturnValue Run() = 0; }; }; @@ -681,6 +682,9 @@ class CallbackWithReturnValueImpl virtual ReturnValue Run() { return (this->obj_->*(this->meth_))(); } + + protected: + virtual ~CallbackWithReturnValueImpl() {} }; template <class T, typename ReturnValue> |