commit 1da0e5e26cb2a0bda267eb6706fe6f87e4012d9e
author bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon May 09 13:28:55 2011 +0000
committer bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon May 09 13:28:55 2011 +0000
tree fe2e3673d536d8a2fdc47163baf22d8559ba26ab
parent 25adce81ce24702174ede33445c414a8d21d8a23

Suppress int/NULL comparison warning



git-svn-id: http://skia.googlecode.com/svn/trunk@1275 2bbb7eff-a529-9590-31e7-b0007b416f81

gpu/src/GrGpuFactory.cpp

diff --git a/gpu/src/GrGpuFactory.cpp b/gpu/src/GrGpuFactory.cpp
index 642a55b..671ac47 100644
--- a/gpu/src/GrGpuFactory.cpp
+++ b/gpu/src/GrGpuFactory.cpp
@@ -53,7 +53,7 @@
 
     switch (engine) {
         case kOpenGL_Shaders_GrEngine:
-            GrAssert(NULL == context3D);
+            GrAssert(NULL == (void*)context3D);
             {
 #if 0 // old code path, will be removed soon
                 gpu = new GrGpuGLShaders2;
@@ -63,11 +63,11 @@
             }
             break;
         case kOpenGL_Fixed_GrEngine:
-            GrAssert(NULL == context3D);
+            GrAssert(NULL == (void*)context3D);
             gpu = new GrGpuGLFixed;
             break;
         case kDirect3D9_GrEngine:
-            GrAssert(NULL != context3D);
+            GrAssert(NULL != (void*)context3D);
 #if GR_WIN32_BUILD
 //            gpu = new GrGpuD3D9((IDirect3DDevice9*)context3D);
 #endif