| Index: tests/GrMemoryPoolTest.cpp
|
| diff --git a/tests/GrMemoryPoolTest.cpp b/tests/GrMemoryPoolTest.cpp
|
| index 81392ce3d526b2ab3833a0d2626e3df5d55c9b4d..4f53c1dedacd5c60e948531ffc24aeae061a92d8 100644
|
| --- a/tests/GrMemoryPoolTest.cpp
|
| +++ b/tests/GrMemoryPoolTest.cpp
|
| @@ -106,12 +106,12 @@ public:
|
| 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);
|
| }
|
|
|