diff options
| author | Fabian Kosmale <fabian.kosmale@qt.io> | 2020-05-26 16:57:36 +0200 |
|---|---|---|
| committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2020-05-28 12:27:44 +0200 |
| commit | f28b48b90e3230d1ce6bbcd5031ecb50089ec12b (patch) | |
| tree | 8a63d5e4fdb7b9648e21d55bdbf4f485c98283da /src/3rdparty | |
| parent | 467be7ed0954618eee19d90f758f51c10802c9be (diff) | |
Fix -Wdeprecated-copy warnings
Mostly by avoiding custom functions when the compiler generated ones
work just fine
Change-Id: If8152fd24c9084bd85be3741fc218709e50fc375
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/masm/stubs/wtf/Vector.h | 1 | ||||
| -rw-r--r-- | src/3rdparty/masm/wtf/CheckedArithmetic.h | 3 | ||||
| -rw-r--r-- | src/3rdparty/masm/wtf/PageBlock.h | 8 |
3 files changed, 3 insertions, 9 deletions
diff --git a/src/3rdparty/masm/stubs/wtf/Vector.h b/src/3rdparty/masm/stubs/wtf/Vector.h index 2fead9f6ba..cee647a4b5 100644 --- a/src/3rdparty/masm/stubs/wtf/Vector.h +++ b/src/3rdparty/masm/stubs/wtf/Vector.h @@ -55,7 +55,6 @@ class Vector : public std::vector<T> { public: Vector() {} Vector(int initialSize) : std::vector<T>(initialSize) {} - Vector(const Vector &other) : std::vector<T>(other) {} Vector(std::initializer_list<T> list) : std::vector<T>(list) {} inline void append(const T& value) diff --git a/src/3rdparty/masm/wtf/CheckedArithmetic.h b/src/3rdparty/masm/wtf/CheckedArithmetic.h index dd4acbb9b5..7d36ca5c28 100644 --- a/src/3rdparty/masm/wtf/CheckedArithmetic.h +++ b/src/3rdparty/masm/wtf/CheckedArithmetic.h @@ -430,6 +430,9 @@ public: { } + Checked(const Checked &) = default; + + Checked(ResultOverflowedTag) : m_value(0) { diff --git a/src/3rdparty/masm/wtf/PageBlock.h b/src/3rdparty/masm/wtf/PageBlock.h index 4d408e1c91..09e4048239 100644 --- a/src/3rdparty/masm/wtf/PageBlock.h +++ b/src/3rdparty/masm/wtf/PageBlock.h @@ -37,7 +37,6 @@ inline bool isPowerOfTwo(size_t size) { return !(size & (size - 1)); } class PageBlock { public: PageBlock(); - PageBlock(const PageBlock&); PageBlock(void*, size_t, bool hasGuardPages); void* realBase() const { return m_realBase; } @@ -69,13 +68,6 @@ inline PageBlock::PageBlock() { } -inline PageBlock::PageBlock(const PageBlock& other) - : m_realBase(other.m_realBase) - , m_base(other.m_base) - , m_size(other.m_size) -{ -} - inline PageBlock::PageBlock(void* base, size_t size, bool hasGuardPages) : m_realBase(base) , m_base(static_cast<char*>(base) + ((base && hasGuardPages) ? pageSize() : 0)) |