| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef SYNC_SYNCABLE_SYNCABLE_H_ | 5 #ifndef SYNC_SYNCABLE_SYNCABLE_H_ |
| 6 #define SYNC_SYNCABLE_SYNCABLE_H_ | 6 #define SYNC_SYNCABLE_SYNCABLE_H_ |
| 7 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include <algorithm> | 9 #include <algorithm> |
| 10 #include <bitset> | 10 #include <bitset> |
| (...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 192 }; | 192 }; |
| 193 | 193 |
| 194 enum { | 194 enum { |
| 195 FIELD_COUNT = PROTO_FIELDS_END, | 195 FIELD_COUNT = PROTO_FIELDS_END, |
| 196 // Past this point we have temporaries, stored in memory only. | 196 // Past this point we have temporaries, stored in memory only. |
| 197 BEGIN_TEMPS = PROTO_FIELDS_END, | 197 BEGIN_TEMPS = PROTO_FIELDS_END, |
| 198 BIT_TEMPS_BEGIN = BEGIN_TEMPS, | 198 BIT_TEMPS_BEGIN = BEGIN_TEMPS, |
| 199 }; | 199 }; |
| 200 | 200 |
| 201 enum BitTemp { | 201 enum BitTemp { |
| 202 // Not to be confused with IS_UNSYNCED, this bit is used to detect local |
| 203 // changes to items that happen during the server Commit operation. |
| 202 SYNCING = BIT_TEMPS_BEGIN, | 204 SYNCING = BIT_TEMPS_BEGIN, |
| 203 BIT_TEMPS_END, | 205 BIT_TEMPS_END, |
| 204 }; | 206 }; |
| 205 | 207 |
| 206 enum { | 208 enum { |
| 207 BIT_TEMPS_COUNT = BIT_TEMPS_END - BIT_TEMPS_BEGIN | 209 BIT_TEMPS_COUNT = BIT_TEMPS_END - BIT_TEMPS_BEGIN |
| 208 }; | 210 }; |
| 209 | 211 |
| 210 class BaseTransaction; | 212 class BaseTransaction; |
| 211 class WriteTransaction; | 213 class WriteTransaction; |
| (...skipping 1134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1346 | 1348 |
| 1347 void ChangeEntryIDAndUpdateChildren(syncable::WriteTransaction* trans, | 1349 void ChangeEntryIDAndUpdateChildren(syncable::WriteTransaction* trans, |
| 1348 syncable::MutableEntry* entry, | 1350 syncable::MutableEntry* entry, |
| 1349 const syncable::Id& new_id); | 1351 const syncable::Id& new_id); |
| 1350 | 1352 |
| 1351 } // namespace syncable | 1353 } // namespace syncable |
| 1352 | 1354 |
| 1353 std::ostream& operator <<(std::ostream&, const syncable::Blob&); | 1355 std::ostream& operator <<(std::ostream&, const syncable::Blob&); |
| 1354 | 1356 |
| 1355 #endif // SYNC_SYNCABLE_SYNCABLE_H_ | 1357 #endif // SYNC_SYNCABLE_SYNCABLE_H_ |
| OLD | NEW |