diff options
| author | Rolland Dudemaine <rolland@ghs.com> | 2016-03-29 06:55:56 +0200 |
|---|---|---|
| committer | Rolland Dudemaine <rolland@ghs.com> | 2016-04-04 07:53:07 +0000 |
| commit | ad1b0b6e7a6b5d266a36138295e6a58ad98fd1ef (patch) | |
| tree | 135132e83f834bdae795634101487b70ff0a5d64 | |
| parent | 02ebc8ba89be301a8bb8761142ec629b27a1493f (diff) | |
Remove dummy implementation for Pass*Ptr operator=().
This resolves a lot of warnings when building with the GHS toolchain.
Change-Id: I061dac0bf42f6a8158afe8eee9c898e8f7ee4dd7
Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com>
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| -rw-r--r-- | src/3rdparty/masm/stubs/wtf/PassOwnPtr.h | 4 | ||||
| -rw-r--r-- | src/3rdparty/masm/stubs/wtf/PassRefPtr.h | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/3rdparty/masm/stubs/wtf/PassOwnPtr.h b/src/3rdparty/masm/stubs/wtf/PassOwnPtr.h index 21436b0bec..0e18132f77 100644 --- a/src/3rdparty/masm/stubs/wtf/PassOwnPtr.h +++ b/src/3rdparty/masm/stubs/wtf/PassOwnPtr.h @@ -101,8 +101,8 @@ public: private: template <typename PtrType> friend PassOwnPtr<PtrType> adoptPtr(PtrType*); - PassOwnPtr<T>& operator=(const PassOwnPtr<T>&) - {} + PassOwnPtr<T>& operator=(const PassOwnPtr<T>& t); + mutable QScopedPointer<T> m_ptr; }; diff --git a/src/3rdparty/masm/stubs/wtf/PassRefPtr.h b/src/3rdparty/masm/stubs/wtf/PassRefPtr.h index 1a837464fa..f072e70dd7 100644 --- a/src/3rdparty/masm/stubs/wtf/PassRefPtr.h +++ b/src/3rdparty/masm/stubs/wtf/PassRefPtr.h @@ -81,8 +81,7 @@ public: } private: - PassRefPtr<T>& operator=(const PassRefPtr<T>&) - {} + PassRefPtr<T>& operator=(const PassRefPtr<T>& t); template <typename PtrType> friend PassRefPtr<PtrType> adoptRef(PtrType*); mutable T* m_ptr; |