aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2011-02-18 21:07:35 +0000
committerGravatar reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2011-02-18 21:07:35 +0000
commitaff86f3fe3f286c5e93cb1f9d3f1c3a819b8cc12 (patch)
treea6ca6b79bd7ab2ea6ba67d1418c86e90a2bec496
parent11a5ff376be94d15daf5bc66cdf857f5f2f297af (diff)
can't use this in STATIC_ASSERT on windows
git-svn-id: http://skia.googlecode.com/svn/trunk@820 2bbb7eff-a529-9590-31e7-b0007b416f81
-rw-r--r--gpu/include/GrGLIRect.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/gpu/include/GrGLIRect.h b/gpu/include/GrGLIRect.h
index b8638c0af9..80237d9196 100644
--- a/gpu/include/GrGLIRect.h
+++ b/gpu/include/GrGLIRect.h
@@ -14,7 +14,7 @@ struct GrGLIRect {
GLsizei fHeight;
void pushToGLViewport() const {
- GR_GL(Viewport(fLeft, fBottom, fWidth, fHeight));
+ GR_GL(Viewport(fLeft, fBottom, fWidth, fHeight));
}
void pushToGLScissor() const {
@@ -22,7 +22,7 @@ struct GrGLIRect {
}
void setFromGLViewport() {
- GR_STATIC_ASSERT(sizeof(*this) == 4*sizeof(GLint));
+ GR_STATIC_ASSERT(sizeof(GrGLIRect) == 4*sizeof(GLint));
GR_GL_GetIntegerv(GL_VIEWPORT, (GLint*) this);
}
@@ -61,4 +61,4 @@ struct GrGLIRect {
bool operator !=(const GrGLIRect& glRect) const {return !(*this == glRect);}
};
-#endif \ No newline at end of file
+#endif