diff options
Diffstat (limited to 'sync/internal_api/public/base')
13 files changed, 54 insertions, 32 deletions
diff --git a/sync/internal_api/public/base/attachment_id_proto.cc b/sync/internal_api/public/base/attachment_id_proto.cc index 7d9cc59..3166b10 100644 --- a/sync/internal_api/public/base/attachment_id_proto.cc +++ b/sync/internal_api/public/base/attachment_id_proto.cc @@ -4,6 +4,9 @@ #include "sync/internal_api/public/base/attachment_id_proto.h" +#include <stddef.h> +#include <stdint.h> + #include <string> #include "base/guid.h" diff --git a/sync/internal_api/public/base/attachment_id_proto.h b/sync/internal_api/public/base/attachment_id_proto.h index bd2a346..f2b49b5 100644 --- a/sync/internal_api/public/base/attachment_id_proto.h +++ b/sync/internal_api/public/base/attachment_id_proto.h @@ -5,7 +5,9 @@ #ifndef SYNC_INTERNAL_API_PUBLIC_BASE_ATTACHMENT_ID_PROTO_H_ #define SYNC_INTERNAL_API_PUBLIC_BASE_ATTACHMENT_ID_PROTO_H_ -#include "base/basictypes.h" +#include <stddef.h> +#include <stdint.h> + #include "sync/base/sync_export.h" #include "sync/protocol/sync.pb.h" diff --git a/sync/internal_api/public/base/enum_set.h b/sync/internal_api/public/base/enum_set.h index 4061a03..df5bcd0 100644 --- a/sync/internal_api/public/base/enum_set.h +++ b/sync/internal_api/public/base/enum_set.h @@ -9,7 +9,6 @@ #include <cstddef> #include <string> -#include "base/basictypes.h" #include "base/logging.h" namespace syncer { diff --git a/sync/internal_api/public/base/enum_set_unittest.cc b/sync/internal_api/public/base/enum_set_unittest.cc index d4692a60..1719226 100644 --- a/sync/internal_api/public/base/enum_set_unittest.cc +++ b/sync/internal_api/public/base/enum_set_unittest.cc @@ -4,7 +4,8 @@ #include "sync/internal_api/public/base/enum_set.h" -#include "base/basictypes.h" +#include <stddef.h> + #include "testing/gtest/include/gtest/gtest.h" namespace syncer { diff --git a/sync/internal_api/public/base/invalidation_interface.h b/sync/internal_api/public/base/invalidation_interface.h index 2efddd6..9726797 100644 --- a/sync/internal_api/public/base/invalidation_interface.h +++ b/sync/internal_api/public/base/invalidation_interface.h @@ -5,9 +5,10 @@ #ifndef SYNC_INTERNAL_API_PUBLIC_BASE_INVALIDATION_INTERFACE_H_ #define SYNC_INTERNAL_API_PUBLIC_BASE_INVALIDATION_INTERFACE_H_ +#include <stdint.h> + #include <string> -#include "base/basictypes.h" #include "sync/base/sync_export.h" namespace syncer { @@ -36,7 +37,7 @@ class SYNC_EXPORT InvalidationInterface { // // It is preferable to use the LessThan() function, which handles unknown // versions properly, rather than this function. - virtual int64 GetVersion() const = 0; + virtual int64_t GetVersion() const = 0; // This function will be called when the invalidation has been handled // successfully. diff --git a/sync/internal_api/public/base/model_type_test_util.cc b/sync/internal_api/public/base/model_type_test_util.cc index 8c1164b..d2924fa 100644 --- a/sync/internal_api/public/base/model_type_test_util.cc +++ b/sync/internal_api/public/base/model_type_test_util.cc @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/macros.h" #include "sync/internal_api/public/base/model_type_test_util.h" namespace syncer { diff --git a/sync/internal_api/public/base/node_ordinal.cc b/sync/internal_api/public/base/node_ordinal.cc index 446486f..21ce8f2 100644 --- a/sync/internal_api/public/base/node_ordinal.cc +++ b/sync/internal_api/public/base/node_ordinal.cc @@ -4,13 +4,16 @@ #include "sync/internal_api/public/base/node_ordinal.h" +#include <stddef.h> +#include <stdint.h> + #include <algorithm> #include <string> namespace syncer { -NodeOrdinal Int64ToNodeOrdinal(int64 x) { - uint64 y = static_cast<uint64>(x); +NodeOrdinal Int64ToNodeOrdinal(int64_t x) { + uint64_t y = static_cast<uint64_t>(x); y ^= 0x8000000000000000ULL; std::string bytes(NodeOrdinal::kMinLength, '\x00'); if (y == 0) { @@ -18,7 +21,7 @@ NodeOrdinal Int64ToNodeOrdinal(int64 x) { bytes.push_back('\x80'); } else { for (int i = 7; i >= 0; --i) { - bytes[i] = static_cast<uint8>(y); + bytes[i] = static_cast<uint8_t>(y); y >>= 8; } } @@ -27,8 +30,8 @@ NodeOrdinal Int64ToNodeOrdinal(int64 x) { return ordinal; } -int64 NodeOrdinalToInt64(const NodeOrdinal& ordinal) { - uint64 y = 0; +int64_t NodeOrdinalToInt64(const NodeOrdinal& ordinal) { + uint64_t y = 0; const std::string& s = ordinal.ToInternalValue(); size_t l = NodeOrdinal::kMinLength; if (s.length() < l) { @@ -36,13 +39,13 @@ int64 NodeOrdinalToInt64(const NodeOrdinal& ordinal) { l = s.length(); } for (size_t i = 0; i < l; ++i) { - const uint8 byte = s[l - i - 1]; - y |= static_cast<uint64>(byte) << (i * 8); + const uint8_t byte = s[l - i - 1]; + y |= static_cast<uint64_t>(byte) << (i * 8); } y ^= 0x8000000000000000ULL; // This is technically implementation-defined if y > INT64_MAX, so // we're assuming that we're on a twos-complement machine. - return static_cast<int64>(y); + return static_cast<int64_t>(y); } } // namespace syncer diff --git a/sync/internal_api/public/base/node_ordinal.h b/sync/internal_api/public/base/node_ordinal.h index e9a70c4..ce58daf 100644 --- a/sync/internal_api/public/base/node_ordinal.h +++ b/sync/internal_api/public/base/node_ordinal.h @@ -5,6 +5,7 @@ #ifndef SYNC_INTERNAL_API_PUBLIC_BASE_NODE_ORDINAL_H_ #define SYNC_INTERNAL_API_PUBLIC_BASE_NODE_ORDINAL_H_ +#include <stddef.h> #include <stdint.h> #include "sync/base/sync_export.h" @@ -15,7 +16,7 @@ namespace syncer { // A NodeOrdinal is an Ordinal whose internal value comes from the // ordinal_in_parent field of SyncEntity (see sync.proto). It uses // the entire uint8_t range for backwards compatibility with the old -// int64-based positioning. +// int64_t-based positioning. struct NodeOrdinalTraits { static const uint8_t kZeroDigit = 0; @@ -40,7 +41,7 @@ static_assert(NodeOrdinal::kMaxDigitValue == 255, static_assert(NodeOrdinal::kRadix == 256, "NodeOrdinal has incorrect radix"); -// Converts an int64 position (usually from the position_in_parent +// Converts an int64_t position (usually from the position_in_parent // field of SyncEntity) to a NodeOrdinal. This transformation // preserves the ordering relation: a < b under integer ordering if // and only if Int64ToNodeOrdinal(a) < Int64ToNodeOrdinal(b). @@ -50,7 +51,7 @@ SYNC_EXPORT NodeOrdinal Int64ToNodeOrdinal(int64_t x); // lossy: NodeOrdinals can have arbitrary fidelity, while numeric // positions contain only 64 bits of information (in fact, this is the // reason we've moved away from them). -SYNC_EXPORT int64 NodeOrdinalToInt64(const NodeOrdinal& ordinal); +SYNC_EXPORT int64_t NodeOrdinalToInt64(const NodeOrdinal& ordinal); } // namespace syncer diff --git a/sync/internal_api/public/base/node_ordinal_unittest.cc b/sync/internal_api/public/base/node_ordinal_unittest.cc index 05961d3..3ade983 100644 --- a/sync/internal_api/public/base/node_ordinal_unittest.cc +++ b/sync/internal_api/public/base/node_ordinal_unittest.cc @@ -12,6 +12,7 @@ #include <limits> #include <vector> +#include "base/macros.h" #include "testing/gtest/include/gtest/gtest.h" namespace syncer { diff --git a/sync/internal_api/public/base/ordinal.h b/sync/internal_api/public/base/ordinal.h index 32d2ff6..6c0f21f 100644 --- a/sync/internal_api/public/base/ordinal.h +++ b/sync/internal_api/public/base/ordinal.h @@ -5,11 +5,12 @@ #ifndef SYNC_INTERNAL_API_PUBLIC_BASE_ORDINAL_H_ #define SYNC_INTERNAL_API_PUBLIC_BASE_ORDINAL_H_ +#include <stdint.h> + #include <algorithm> #include <cstddef> #include <string> -#include "base/basictypes.h" #include "base/json/string_escape.h" #include "base/logging.h" @@ -38,8 +39,8 @@ namespace syncer { // struct MyOrdinalTraits { // // There must be at least two distinct values greater than kZeroDigit // // and less than kMaxDigit. -// static const uint8 kZeroDigit = '0'; -// static const uint8 kMaxDigit = '9'; +// static const uint8_t kZeroDigit = '0'; +// static const uint8_t kMaxDigit = '9'; // // kMinLength must be positive. // static const size_t kMinLength = 1; // }; @@ -132,11 +133,11 @@ class Ordinal { // Use of copy constructor and default assignment for this class is allowed. // Constants for Ordinal digits. - static const uint8 kZeroDigit = Traits::kZeroDigit; - static const uint8 kMaxDigit = Traits::kMaxDigit; + static const uint8_t kZeroDigit = Traits::kZeroDigit; + static const uint8_t kMaxDigit = Traits::kMaxDigit; static const size_t kMinLength = Traits::kMinLength; - static const uint8 kOneDigit = kZeroDigit + 1; - static const uint8 kMidDigit = kOneDigit + (kMaxDigit - kOneDigit) / 2; + static const uint8_t kOneDigit = kZeroDigit + 1; + static const uint8_t kMidDigit = kOneDigit + (kMaxDigit - kOneDigit) / 2; static const unsigned int kMidDigitValue = kMidDigit - kZeroDigit; static const unsigned int kMaxDigitValue = kMaxDigit - kZeroDigit; static const unsigned int kRadix = kMaxDigitValue + 1; @@ -162,7 +163,7 @@ class Ordinal { // Returns the digit at position i, padding with zero digits if // required. - static uint8 GetDigit(const std::string& bytes, size_t i); + static uint8_t GetDigit(const std::string& bytes, size_t i); // Returns the digit value at position i, padding with 0 if required. static int GetDigitValue(const std::string& bytes, size_t i); @@ -197,11 +198,15 @@ class Ordinal { bool is_valid_; }; -template <typename Traits> const uint8 Ordinal<Traits>::kZeroDigit; -template <typename Traits> const uint8 Ordinal<Traits>::kMaxDigit; +template <typename Traits> +const uint8_t Ordinal<Traits>::kZeroDigit; +template <typename Traits> +const uint8_t Ordinal<Traits>::kMaxDigit; template <typename Traits> const size_t Ordinal<Traits>::kMinLength; -template <typename Traits> const uint8 Ordinal<Traits>::kOneDigit; -template <typename Traits> const uint8 Ordinal<Traits>::kMidDigit; +template <typename Traits> +const uint8_t Ordinal<Traits>::kOneDigit; +template <typename Traits> +const uint8_t Ordinal<Traits>::kMidDigit; template <typename Traits> const unsigned int Ordinal<Traits>::kMidDigitValue; template <typename Traits> const unsigned int Ordinal<Traits>::kMaxDigitValue; template <typename Traits> const unsigned int Ordinal<Traits>::kRadix; @@ -348,7 +353,7 @@ bool Ordinal<Traits>::IsValidOrdinalBytes(const std::string& bytes) { bool found_non_zero = false; for (size_t i = 0; i < length; ++i) { - const uint8 byte = bytes[i]; + const uint8_t byte = bytes[i]; if (byte < kZeroDigit || byte > kMaxDigit) return false; if (byte > kZeroDigit) @@ -358,7 +363,7 @@ bool Ordinal<Traits>::IsValidOrdinalBytes(const std::string& bytes) { return false; if (length > kMinLength) { - const uint8 last_byte = bytes[length - 1]; + const uint8_t last_byte = bytes[length - 1]; if (last_byte == kZeroDigit) return false; } @@ -384,7 +389,7 @@ size_t Ordinal<Traits>::GetLengthWithoutTrailingZeroDigits( } template <typename Traits> -uint8 Ordinal<Traits>::GetDigit(const std::string& bytes, size_t i) { +uint8_t Ordinal<Traits>::GetDigit(const std::string& bytes, size_t i) { return (i < bytes.length()) ? bytes[i] : kZeroDigit; } diff --git a/sync/internal_api/public/base/unique_position.cc b/sync/internal_api/public/base/unique_position.cc index 5576215..9924cb4 100644 --- a/sync/internal_api/public/base/unique_position.cc +++ b/sync/internal_api/public/base/unique_position.cc @@ -4,6 +4,9 @@ #include "sync/internal_api/public/base/unique_position.h" +#include <stddef.h> +#include <stdint.h> + #include <algorithm> #include <limits> diff --git a/sync/internal_api/public/base/unique_position.h b/sync/internal_api/public/base/unique_position.h index d425f9a..70e9b39 100644 --- a/sync/internal_api/public/base/unique_position.h +++ b/sync/internal_api/public/base/unique_position.h @@ -5,6 +5,7 @@ #ifndef SYNC_INTERNAL_API_PUBLIC_BASE_UNIQUE_POSITION_H_ #define SYNC_INTERNAL_API_PUBLIC_BASE_UNIQUE_POSITION_H_ +#include <stddef.h> #include <stdint.h> #include <string> diff --git a/sync/internal_api/public/base/unique_position_unittest.cc b/sync/internal_api/public/base/unique_position_unittest.cc index 6b3fb8c..a666077 100644 --- a/sync/internal_api/public/base/unique_position_unittest.cc +++ b/sync/internal_api/public/base/unique_position_unittest.cc @@ -4,6 +4,7 @@ #include "sync/internal_api/public/base/unique_position.h" +#include <stddef.h> #include <stdint.h> #include <algorithm> @@ -12,8 +13,8 @@ #include <vector> #include "base/base64.h" -#include "base/basictypes.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/sha1.h" #include "base/strings/string_number_conversions.h" |