No bug: Fix some class/struct mismatch warnings on MSVC.
authorKyle Huey <khuey@kylehuey.com>
Fri, 24 Aug 2012 11:45:05 -0700
changeset 105361 a5549c0a8817afb1ba4a8087b8b1759140ac4606
parent 105360 3331ec03e60fe6bd4bf8b4ba79679c44515c8443
child 105362 1c44596f22cfafe720cded7ea16099c332c9555e
push id55
push usershu@rfrn.org
push dateThu, 30 Aug 2012 01:33:09 +0000
milestone17.0a1
No bug: Fix some class/struct mismatch warnings on MSVC.
gfx/gl/GLContext.h
--- a/gfx/gl/GLContext.h
+++ b/gfx/gl/GLContext.h
@@ -3318,17 +3318,17 @@ public:
 
         mIsUnwrapped = true;
     }
 };
 
 struct ScopedFramebufferTexture
     : public ScopedGLWrapper<ScopedFramebufferTexture>
 {
-    friend class ScopedGLWrapper<ScopedFramebufferTexture>;
+    friend struct ScopedGLWrapper<ScopedFramebufferTexture>;
 
 protected:
     bool mComplete; // True if the framebuffer we create is complete.
     GLuint mFB;
 
 public:
     ScopedFramebufferTexture(GLContext* gl, GLuint texture)
         : ScopedGLWrapper<ScopedFramebufferTexture>(gl)
@@ -3376,17 +3376,17 @@ public:
         return mComplete;
     }
 };
 
 // Wraps glEnable/Disable.
 struct ScopedGLState
     : public ScopedGLWrapper<ScopedGLState>
 {
-    friend class ScopedGLWrapper<ScopedGLState>;
+    friend struct ScopedGLWrapper<ScopedGLState>;
 
 protected:
     const GLenum mCapability;
     bool mOldState;
 
 public:
     // Use |newState = true| to enable, |false| to disable.
     ScopedGLState(GLContext* gl, GLenum capability, bool newState)
@@ -3416,17 +3416,17 @@ protected:
             mGL->fDisable(mCapability);
     }
 };
 
 // Saves and restores with GetUserBoundFBO and BindUserFBO.
 struct ScopedFramebufferBinding
     : public ScopedGLWrapper<ScopedFramebufferBinding>
 {
-    friend class ScopedGLWrapper<ScopedFramebufferBinding>;
+    friend struct ScopedGLWrapper<ScopedFramebufferBinding>;
 
 protected:
     GLuint mOldState;
 
 private:
     void Init() {
         MOZ_ASSERT(mGL->IsCurrent());
         mOldState = mGL->GetUserBoundFBO();