Fix warnings on VS2015 x86_64 build
[email protected]
Review URL: https://codereview.chromium.org/1276133002
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);
}
