diff options
author | halcanary <halcanary@google.com> | 2015-08-27 08:32:26 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-08-27 08:32:26 -0700 |
commit | aaf951d537da8769d22c43c321f169ceebc1a24b (patch) | |
tree | b92ec1dbf61334c68740e6bb8d46e1f0366a46e3 /src/gpu/gl/mesa | |
parent | 96fcdcc219d2a0d3579719b84b28bede76efba64 (diff) |
nullptr isn't an int; this is what we want
Review URL: https://codereview.chromium.org/1306753006
Diffstat (limited to 'src/gpu/gl/mesa')
-rw-r--r-- | src/gpu/gl/mesa/SkMesaGLContext.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gpu/gl/mesa/SkMesaGLContext.cpp b/src/gpu/gl/mesa/SkMesaGLContext.cpp index 730206e560..541b247fa8 100644 --- a/src/gpu/gl/mesa/SkMesaGLContext.cpp +++ b/src/gpu/gl/mesa/SkMesaGLContext.cpp @@ -14,7 +14,7 @@ static const GrGLint gBOGUS_SIZE = 16; SkMesaGLContext::SkMesaGLContext() - : fContext(static_cast<Context>(nullptr)) + : fContext(static_cast<Context>(0)) , fImage(nullptr) { GR_STATIC_ASSERT(sizeof(Context) == sizeof(OSMesaContext)); @@ -79,7 +79,7 @@ void SkMesaGLContext::destroyGLContext() { if (fContext) { OSMesaDestroyContext((OSMesaContext)fContext); - fContext = static_cast<Context>(nullptr); + fContext = static_cast<Context>(0); } } |