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

Unified Diff: crypto/mock_keychain_mac.cc

Issue 10738003: src/crypto should build on the x86_64 architecture. (Closed) Base URL: https://src.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 5 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
« crypto/mock_keychain_mac.h ('K') | « crypto/mock_keychain_mac.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: crypto/mock_keychain_mac.cc
===================================================================
--- crypto/mock_keychain_mac.cc (revision 145645)
+++ crypto/mock_keychain_mac.cc (working copy)
@@ -175,7 +175,7 @@
UInt32* length,
void** outData) const {
DCHECK(itemRef);
- unsigned int key = reinterpret_cast<unsigned int>(itemRef) - 1;
+ uintptr_t key = reinterpret_cast<uintptr_t>(itemRef) - 1;
if (keychain_attr_list_.find(key) == keychain_attr_list_.end())
return errSecInvalidItemRef;
@@ -204,7 +204,7 @@
return errSecAuthFailed;
}
- unsigned int key = reinterpret_cast<unsigned int>(itemRef) - 1;
+ uintptr_t key = reinterpret_cast<uintptr_t>(itemRef) - 1;
if (keychain_attr_list_.find(key) == keychain_attr_list_.end())
return errSecInvalidItemRef;
@@ -232,7 +232,7 @@
}
OSStatus MockKeychain::ItemDelete(SecKeychainItemRef itemRef) const {
- unsigned int key = reinterpret_cast<unsigned int>(itemRef) - 1;
+ uintptr_t key = reinterpret_cast<uintptr_t>(itemRef) - 1;
for (unsigned int i = 0; i < keychain_attr_list_[key].count; ++i) {
if (keychain_attr_list_[key].attr[i].data)
@@ -483,7 +483,7 @@
if (!ref)
return;
- if (reinterpret_cast<int>(ref) == kDummySearchRef) {
+ if (reinterpret_cast<uintptr_t>(ref) == kDummySearchRef) {
--search_copy_count_;
} else {
--keychain_item_copy_count_;
« crypto/mock_keychain_mac.h ('K') | « crypto/mock_keychain_mac.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698