diff options
| author | dschuff@chromium.org <dschuff@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-15 03:40:20 +0000 |
|---|---|---|
| committer | dschuff@chromium.org <dschuff@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-15 03:40:20 +0000 |
| commit | 158424490a458e6edec627595509bdc54a144cb3 (patch) | |
| tree | 20289415141e7f2144ecefd51a95d91825435474 /ppapi/native_client | |
| parent | 0319f295be5ff93d808b652989831136b00fd3d8 (diff) | |
| download | chromium_src-158424490a458e6edec627595509bdc54a144cb3.zip chromium_src-158424490a458e6edec627595509bdc54a144cb3.tar.gz chromium_src-158424490a458e6edec627595509bdc54a144cb3.tar.bz2 | |
Declare virtual destructor in Nacl plugin CallbackSource to fix mac build
R= ncbray@google.com,noelallen@google.com
BUG=none
TEST=mac nacl plugin scons build
Review URL: https://chromiumcodereview.appspot.com/10536181
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@142333 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/native_client')
| -rw-r--r-- | ppapi/native_client/src/trusted/plugin/callback_source.h | 1 | ||||
| -rw-r--r-- | ppapi/native_client/src/trusted/plugin/pnacl_coordinator.cc | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/ppapi/native_client/src/trusted/plugin/callback_source.h b/ppapi/native_client/src/trusted/plugin/callback_source.h index 2397761..928a577 100644 --- a/ppapi/native_client/src/trusted/plugin/callback_source.h +++ b/ppapi/native_client/src/trusted/plugin/callback_source.h @@ -24,6 +24,7 @@ namespace plugin { template<class T> class CallbackSource { public: + virtual ~CallbackSource(); // Returns a callback from callback_factory's NewCallbackWithOutput, // bound to the implementing object. virtual pp::CompletionCallbackWithOutput<T> GetCallback() = 0; diff --git a/ppapi/native_client/src/trusted/plugin/pnacl_coordinator.cc b/ppapi/native_client/src/trusted/plugin/pnacl_coordinator.cc index 7ef2902..2ce0f29 100644 --- a/ppapi/native_client/src/trusted/plugin/pnacl_coordinator.cc +++ b/ppapi/native_client/src/trusted/plugin/pnacl_coordinator.cc @@ -166,6 +166,12 @@ class PnaclLDManifest : public Manifest { ////////////////////////////////////////////////////////////////////// // The coordinator class. ////////////////////////////////////////////////////////////////////// + +// Out-of-line destructor to keep it from getting put in every .o where +// callback_source.h is included +template<> +CallbackSource<FileStreamData>::~CallbackSource() {} + PnaclCoordinator* PnaclCoordinator::BitcodeToNative( Plugin* plugin, const nacl::string& pexe_url, |