Bug 1371190 - Fix st-an fail draft
authorChih-Yi Leu <subsevenx2001@gmail.com>
Mon, 09 Oct 2017 13:42:06 +0800
changeset 676638 2677e69995ad4a8843c8df482bbedfcc73c3516f
parent 675286 65022b9de73513eed1fa009072878fddfa438171
child 734994 7197e3db61d42ca361ff4326aa34d1c0a0b7dfcd
push id83559
push userbmo:cleu@mozilla.com
push dateMon, 09 Oct 2017 06:50:44 +0000
bugs1371190
milestone58.0a1
Bug 1371190 - Fix st-an fail MozReview-Commit-ID: 8cafjGFthfT
gfx/angle/src/common/bitset_utils.h
gfx/angle/src/libANGLE/VertexAttribute.h
--- a/gfx/angle/src/common/bitset_utils.h
+++ b/gfx/angle/src/common/bitset_utils.h
@@ -30,17 +30,17 @@ class BitSetT final
     {
       public:
         ~Reference() {}
         Reference &operator=(bool x)
         {
             mParent->set(mBit, x);
             return *this;
         }
-        operator bool() const { return mParent->test(mBit); }
+        explicit operator bool() const { return mParent->test(mBit); }
 
       private:
         friend class BitSetT;
 
         Reference(BitSetT *parent, std::size_t bit) : mParent(parent), mBit(bit) {}
 
         BitSetT *mParent;
         std::size_t mBit;
--- a/gfx/angle/src/libANGLE/VertexAttribute.h
+++ b/gfx/angle/src/libANGLE/VertexAttribute.h
@@ -18,17 +18,17 @@ class VertexArray;
 //
 // Implementation of Generic Vertex Attribute Bindings for ES3.1. The members are intentionally made
 // private in order to hide implementation details.
 //
 class VertexBinding final : angle::NonCopyable
 {
   public:
     VertexBinding();
-    explicit VertexBinding(VertexBinding &&binding);
+    VertexBinding(VertexBinding &&binding);
     VertexBinding &operator=(VertexBinding &&binding);
 
     GLuint getStride() const { return mStride; }
     void setStride(GLuint strideIn) { mStride = strideIn; }
 
     GLuint getDivisor() const { return mDivisor; }
     void setDivisor(GLuint divisorIn) { mDivisor = divisorIn; }
 
@@ -47,17 +47,17 @@ class VertexBinding final : angle::NonCo
 };
 
 //
 // Implementation of Generic Vertex Attributes for ES3.1
 //
 struct VertexAttribute final : private angle::NonCopyable
 {
     explicit VertexAttribute(GLuint bindingIndex);
-    explicit VertexAttribute(VertexAttribute &&attrib);
+    VertexAttribute(VertexAttribute &&attrib);
     VertexAttribute &operator=(VertexAttribute &&attrib);
 
     bool enabled;  // For glEnable/DisableVertexAttribArray
     GLenum type;
     GLuint size;
     bool normalized;
     bool pureInteger;