Index: sync/internal_api/sync_encryption_handler_impl.cc |
diff --git a/sync/internal_api/sync_encryption_handler_impl.cc b/sync/internal_api/sync_encryption_handler_impl.cc |
index 3ea242c0c738a6e66aaff228300bf0c5e17906a4..7bd10b9704503a65893230d19d958cef0ab8d5fd 100644 |
--- a/sync/internal_api/sync_encryption_handler_impl.cc |
+++ b/sync/internal_api/sync_encryption_handler_impl.cc |
@@ -4,6 +4,9 @@ |
#include "sync/internal_api/sync_encryption_handler_impl.h" |
+#include <stddef.h> |
+#include <stdint.h> |
+ |
#include <queue> |
#include <string> |
@@ -833,8 +836,8 @@ void SyncEncryptionHandlerImpl::ReEncryptEverything( |
continue; // Don't try to reencrypt if the type's data is unavailable. |
// Iterate through all children of this datatype. |
- std::queue<int64> to_visit; |
- int64 child_id = type_root.GetFirstChildId(); |
+ std::queue<int64_t> to_visit; |
+ int64_t child_id = type_root.GetFirstChildId(); |
to_visit.push(child_id); |
while (!to_visit.empty()) { |
child_id = to_visit.front(); |
@@ -861,7 +864,7 @@ void SyncEncryptionHandlerImpl::ReEncryptEverything( |
// encrypted so we don't need to check GetEncryptedTypes() here. |
ReadNode passwords_root(trans); |
if (passwords_root.InitTypeRoot(PASSWORDS) == BaseNode::INIT_OK) { |
- int64 child_id = passwords_root.GetFirstChildId(); |
+ int64_t child_id = passwords_root.GetFirstChildId(); |
while (child_id != kInvalidId) { |
WriteNode child(trans); |
if (child.InitByIdLookup(child_id) != BaseNode::INIT_OK) |