Commit 2c1183bb by Jamie Madill Committed by Commit Bot

Fix compile on non C++14 configs.

The WrappedArray move constructor was not contexpr under c++11 rules. New code was introduced when fixing D3D11 runtime warnings. BUG=angleproject:2025 Change-Id: Ie322d9fa3db36f320b7a9ef5048a23c31c153ad1 Reviewed-on: https://chromium-review.googlesource.com/633911Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
parent 41013bdd
...@@ -100,7 +100,7 @@ class WrappedArray final : angle::NonCopyable ...@@ -100,7 +100,7 @@ class WrappedArray final : angle::NonCopyable
constexpr WrappedArray() : mArray(nullptr), mSize(0) {} constexpr WrappedArray() : mArray(nullptr), mSize(0) {}
constexpr WrappedArray(const T *data, size_t size) : mArray(data), mSize(size) {} constexpr WrappedArray(const T *data, size_t size) : mArray(data), mSize(size) {}
constexpr WrappedArray(WrappedArray &&other) : WrappedArray() WrappedArray(WrappedArray &&other) : WrappedArray()
{ {
std::swap(mArray, other.mArray); std::swap(mArray, other.mArray);
std::swap(mSize, other.mSize); std::swap(mSize, other.mSize);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment