diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2013-04-12 15:51:47 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@digia.com> | 2013-04-12 17:30:58 +0200 |
| commit | caddc2a7b4f0b6433462d2b4660a2d9ac26585fd (patch) | |
| tree | 2d0ecd417db42439ee5a40d4c7be478aa8b1d916 /src/3rdparty/masm/stubs/wtf/PassOwnPtr.h | |
| parent | 1cdcfa500ac971727d57db8edcb41abe38516e5a (diff) | |
Fix build of the rest of v4vm against WTF/JSC update
* Add missing functions to our WTF stubs
* Some of the math functions wrapped with MathExtras.h are back in the std:: namespace
they belong to
Change-Id: I9da43e8344ab8c95edc8db19f44ccdbd91b4ac70
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/3rdparty/masm/stubs/wtf/PassOwnPtr.h')
| -rw-r--r-- | src/3rdparty/masm/stubs/wtf/PassOwnPtr.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/3rdparty/masm/stubs/wtf/PassOwnPtr.h b/src/3rdparty/masm/stubs/wtf/PassOwnPtr.h index f9b84e7b57..601d278c16 100644 --- a/src/3rdparty/masm/stubs/wtf/PassOwnPtr.h +++ b/src/3rdparty/masm/stubs/wtf/PassOwnPtr.h @@ -54,6 +54,10 @@ struct OwnPtr : public QScopedPointer<T> : QScopedPointer<T>(ptr.leakRef()) {} + OwnPtr(const OwnPtr<T>& other) + : QScopedPointer<T>(const_cast<OwnPtr<T> &>(other).take()) + {} + OwnPtr& operator=(const OwnPtr<T>& other) { this->reset(const_cast<OwnPtr<T> &>(other).take()); |