summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
authordeanm@chromium.org <deanm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-03 15:59:22 +0000
committerdeanm@chromium.org <deanm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-03 15:59:22 +0000
commitcf76214c53788effec9c2e9cf14dbfc91887921e (patch)
tree9ed36895dc26ca1cd696b56445c1feaa5b8b392f /base
parent8b35a84335ef7402cddc09446127b8721d65fc61 (diff)
downloadchromium_src-cf76214c53788effec9c2e9cf14dbfc91887921e.zip
chromium_src-cf76214c53788effec9c2e9cf14dbfc91887921e.tar.gz
chromium_src-cf76214c53788effec9c2e9cf14dbfc91887921e.tar.bz2
Use intptr_t for casting pointers for 64-bit.
Review URL: http://codereview.chromium.org/160522 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22269 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
-rw-r--r--base/thread_local_storage_unittest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/base/thread_local_storage_unittest.cc b/base/thread_local_storage_unittest.cc
index f2ce8367..cb24c75 100644
--- a/base/thread_local_storage_unittest.cc
+++ b/base/thread_local_storage_unittest.cc
@@ -58,7 +58,7 @@ void ThreadLocalStorageCleanup(void *value) {
TEST(ThreadLocalStorageTest, Basics) {
ThreadLocalStorage::Slot slot;
slot.Set(reinterpret_cast<void*>(123));
- int value = reinterpret_cast<int>(slot.Get());
+ int value = reinterpret_cast<intptr_t>(slot.Get());
EXPECT_EQ(value, 123);
}