Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1155)

Unified Diff: tests/GrMemoryPoolTest.cpp

Issue 1276133002: Fix warnings on VS2015 x86_64 build (Closed) Base URL: https://skia.googlesource.com/skia.git@didSetPipeline
Patch Set: tabs- Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/gpu/GrDrawTarget.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
}
« no previous file with comments | « src/gpu/GrDrawTarget.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698