Commit f0915a89 by Olli Etuaho

Fix standalone build in MSVS 2013

Range-based for loop saves the end iterator by assigning it to a variable, so the iterator class needs to have a copy constructor at least on some C++ compiler implementations. The issue got introduced by a chain of three commits, so it's better to just fix the issue rather than revert them all. TEST=build on Windows Change-Id: Ib6d8d7e97559838eaac44279454197445535f256 Reviewed-on: https://chromium-review.googlesource.com/309723 Tryjob-Request: Olli Etuaho <oetuaho@nvidia.com> Tested-by: 's avatarOlli Etuaho <oetuaho@nvidia.com> Reviewed-by: 's avatarOlli Etuaho <oetuaho@nvidia.com>
parent 2df979ed
...@@ -264,6 +264,9 @@ struct PackedVaryingRegister final ...@@ -264,6 +264,9 @@ struct PackedVaryingRegister final
{ {
PackedVaryingRegister() : varyingIndex(0), elementIndex(0), rowIndex(0) {} PackedVaryingRegister() : varyingIndex(0), elementIndex(0), rowIndex(0) {}
PackedVaryingRegister(const PackedVaryingRegister &) = default;
PackedVaryingRegister &operator=(const PackedVaryingRegister &) = default;
unsigned int registerIndex(const gl::Caps &caps, unsigned int registerIndex(const gl::Caps &caps,
const std::vector<PackedVarying> &packedVaryings) const const std::vector<PackedVarying> &packedVaryings) const
{ {
...@@ -285,6 +288,10 @@ class PackedVaryingIterator final : public angle::NonCopyable ...@@ -285,6 +288,10 @@ class PackedVaryingIterator final : public angle::NonCopyable
{ {
public: public:
Iterator(const PackedVaryingIterator &parent); Iterator(const PackedVaryingIterator &parent);
Iterator(const Iterator &) = default;
Iterator &operator=(const Iterator &) = delete;
Iterator &operator++(); Iterator &operator++();
bool operator==(const Iterator &other) const; bool operator==(const Iterator &other) const;
bool operator!=(const Iterator &other) const; bool operator!=(const Iterator &other) const;
......
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