diff options
| author |  bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-01-07 17:21:07 +0000 |
|---|---|---|
| committer | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-01-07 17:21:07 +0000 |
| commit | 674a3a2ffd568e6e0d27fba0da596034276bbb65 (patch) | |
| tree | 55c4fc59cc6dc2e75ba19c9d38ff79108ffa1187 /src | |
| parent | 05af1afd429808913683da75644e48bece12e820 (diff) | |
Attempt to fix NULL to intptr_t warning-as-error on mac build.
git-svn-id: http://skia.googlecode.com/svn/trunk@7052 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src')
| -rw-r--r-- | src/gpu/gl/mesa/SkMesaGLContext.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gpu/gl/mesa/SkMesaGLContext.cpp b/src/gpu/gl/mesa/SkMesaGLContext.cpp index cac021c170..6c6e4228f3 100644 --- a/src/gpu/gl/mesa/SkMesaGLContext.cpp +++ b/src/gpu/gl/mesa/SkMesaGLContext.cpp @@ -30,7 +30,7 @@ SkMesaGLContext::AutoContextRestore::~AutoContextRestore() { /////////////////////////////////////////////////////////////////////////////// SkMesaGLContext::SkMesaGLContext() - : fContext(NULL) + : fContext(static_cast<Context>(NULL)) , fImage(NULL) { GR_STATIC_ASSERT(sizeof(Context) == sizeof(OSMesaContext)); } |