diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2014-09-02 14:48:03 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-09-30 13:31:38 +0200 |
| commit | 328f7bbab666c7af1aec2df69cbdd7ea1a3991db (patch) | |
| tree | 708fc65661042e8dfbc96d8c7e6e3afbe547089b /src/qml/jsruntime/qv4managed_p.h | |
| parent | f83d12e0c27ad76d98d66a663140a09698b11d37 (diff) | |
Fix compiler warning
Add a matching operator delete to our operator new to shut
up MSVC.
Task-number: QTBUG-40652
Change-Id: I1396094d23c4d0cfc88a73fabbab05f1d4ec7b44
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4managed_p.h')
| -rw-r--r-- | src/qml/jsruntime/qv4managed_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/qml/jsruntime/qv4managed_p.h b/src/qml/jsruntime/qv4managed_p.h index 36cf8f9424..ce0ee973e8 100644 --- a/src/qml/jsruntime/qv4managed_p.h +++ b/src/qml/jsruntime/qv4managed_p.h @@ -212,6 +212,7 @@ struct Q_QML_PRIVATE_EXPORT Managed void *operator new(size_t, Managed *m) { return m; } void *operator new(size_t, Managed::Data *m) { return m; } + void operator delete(void *, Managed::Data *) {} }; Data data; V4_MANAGED(Managed) |