commit ebc1c10fe1befb4f8025e825d3fb6012c145c593
author bsalomon <bsalomon@google.com> Thu Aug 06 17:33:16 2015 -0700
committer Commit bot <commit-bot@chromium.org> Thu Aug 06 17:33:16 2015 -0700
tree 29e3af0a027e62ca15940ea4999e5a1760fece55
parent 4ab9d5f1bc6d05c49dc765c3de5ade816f4c968e

Fix warnings on VS2015 x86_64 build

TBR=bungeman@google.com

Review URL: https://codereview.chromium.org/1276133002

tests/GrMemoryPoolTest.cpp

diff --git a/tests/GrMemoryPoolTest.cpp b/tests/GrMemoryPoolTest.cpp
index 81392ce..4f53c1d 100644
--- a/tests/GrMemoryPoolTest.cpp
+++ b/tests/GrMemoryPoolTest.cpp
@@ -106,12 +106,12 @@
         fB = new B();
     }
     virtual void setValues(int v) {
-        fVoidStar = reinterpret_cast<void*>(v);
+        fVoidStar = reinterpret_cast<void*>(static_cast<intptr_t>(v));
         this->INHERITED::setValues(v);
         fB->setValues(v);
     }
     virtual bool checkValues(int v) {
-        return fVoidStar == reinterpret_cast<void*>(v) &&
+        return fVoidStar == reinterpret_cast<void*>(static_cast<intptr_t>(v)) &&
                fB->checkValues(v) &&
                this->INHERITED::checkValues(v);
     }