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

Unified Diff: components/sync/base/ordinal.h

Issue 2130453004: [Sync] Move //sync to //components/sync. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 4 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
« no previous file with comments | « components/sync/base/node_ordinal_unittest.cc ('k') | components/sync/base/ordinal_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/sync/base/ordinal.h
diff --git a/sync/internal_api/public/base/ordinal.h b/components/sync/base/ordinal.h
similarity index 94%
rename from sync/internal_api/public/base/ordinal.h
rename to components/sync/base/ordinal.h
index 81798a4ea8d348185727dddb97d0145c1f3f1a56..92fc5eea1d34d0dc03d1896068217bfdbb3c3475 100644
--- a/sync/internal_api/public/base/ordinal.h
+++ b/components/sync/base/ordinal.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SYNC_INTERNAL_API_PUBLIC_BASE_ORDINAL_H_
-#define SYNC_INTERNAL_API_PUBLIC_BASE_ORDINAL_H_
+#ifndef COMPONENTS_SYNC_BASE_ORDINAL_H_
+#define COMPONENTS_SYNC_BASE_ORDINAL_H_
#include <stdint.h>
@@ -157,9 +157,8 @@ class Ordinal {
// Returns the length that bytes.substr(0, length) would be with
// trailing zero digits removed.
- static size_t GetLengthWithoutTrailingZeroDigits(
- const std::string& bytes,
- size_t length);
+ static size_t GetLengthWithoutTrailingZeroDigits(const std::string& bytes,
+ size_t length);
// Returns the digit at position i, padding with zero digits if
// required.
@@ -202,14 +201,18 @@ 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 size_t Ordinal<Traits>::kMinLength;
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;
+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;
template <typename Traits>
Ordinal<Traits>::LessThanFn::LessThanFn() {}
@@ -231,8 +234,7 @@ bool Ordinal<Traits>::EqualsFn::operator()(const Ordinal<Traits>& lhs,
template <typename Traits>
Ordinal<Traits>::Ordinal(const std::string& bytes)
- : bytes_(bytes),
- is_valid_(IsValidOrdinalBytes(bytes_)) {}
+ : bytes_(bytes), is_valid_(IsValidOrdinalBytes(bytes_)) {}
template <typename Traits>
Ordinal<Traits>::Ordinal() : is_valid_(false) {}
@@ -373,7 +375,8 @@ bool Ordinal<Traits>::IsValidOrdinalBytes(const std::string& bytes) {
template <typename Traits>
size_t Ordinal<Traits>::GetLengthWithoutTrailingZeroDigits(
- const std::string& bytes, size_t length) {
+ const std::string& bytes,
+ size_t length) {
DCHECK(!bytes.empty());
DCHECK_GT(length, 0U);
@@ -400,7 +403,8 @@ int Ordinal<Traits>::GetDigitValue(const std::string& bytes, size_t i) {
template <typename Traits>
int Ordinal<Traits>::AddDigitValue(std::string* bytes,
- size_t i, int digit_value) {
+ size_t i,
+ int digit_value) {
DCHECK_GE(i, 0U);
DCHECK_LT(i, bytes->length());
@@ -435,9 +439,8 @@ size_t Ordinal<Traits>::GetProperLength(const std::string& lower_bound,
}
template <typename Traits>
-std::string Ordinal<Traits>::ComputeMidpoint(
- const std::string& start,
- const std::string& end) {
+std::string Ordinal<Traits>::ComputeMidpoint(const std::string& start,
+ const std::string& end) {
size_t max_size = std::max(start.length(), end.length()) + 1;
std::string midpoint(max_size, kZeroDigit);
@@ -486,4 +489,4 @@ Ordinal<Traits> Ordinal<Traits>::CreateOrdinalBetween(
} // namespace syncer
-#endif // SYNC_INTERNAL_API_PUBLIC_BASE_ORDINAL_H_
+#endif // COMPONENTS_SYNC_BASE_ORDINAL_H_
« no previous file with comments | « components/sync/base/node_ordinal_unittest.cc ('k') | components/sync/base/ordinal_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698