| Index: components/sync/base/node_ordinal.h
|
| diff --git a/sync/internal_api/public/base/node_ordinal.h b/components/sync/base/node_ordinal.h
|
| similarity index 85%
|
| rename from sync/internal_api/public/base/node_ordinal.h
|
| rename to components/sync/base/node_ordinal.h
|
| index ce58dafdf71245a7dff9ffc5f9706e543b5371f2..60813288c535d639691ea673a7637ae56bfcdd50 100644
|
| --- a/sync/internal_api/public/base/node_ordinal.h
|
| +++ b/components/sync/base/node_ordinal.h
|
| @@ -2,14 +2,14 @@
|
| // 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_NODE_ORDINAL_H_
|
| -#define SYNC_INTERNAL_API_PUBLIC_BASE_NODE_ORDINAL_H_
|
| +#ifndef COMPONENTS_SYNC_BASE_NODE_ORDINAL_H_
|
| +#define COMPONENTS_SYNC_BASE_NODE_ORDINAL_H_
|
|
|
| #include <stddef.h>
|
| #include <stdint.h>
|
|
|
| -#include "sync/base/sync_export.h"
|
| -#include "sync/internal_api/public/base/ordinal.h"
|
| +#include "components/sync/base/ordinal.h"
|
| +#include "components/sync/base/sync_export.h"
|
|
|
| namespace syncer {
|
|
|
| @@ -38,8 +38,7 @@ static_assert(NodeOrdinal::kMidDigitValue == 128,
|
| "NodeOrdinal has incorrect mid digit value");
|
| static_assert(NodeOrdinal::kMaxDigitValue == 255,
|
| "NodeOrdinal has incorrect max digit value");
|
| -static_assert(NodeOrdinal::kRadix == 256,
|
| - "NodeOrdinal has incorrect radix");
|
| +static_assert(NodeOrdinal::kRadix == 256, "NodeOrdinal has incorrect radix");
|
|
|
| // Converts an int64_t position (usually from the position_in_parent
|
| // field of SyncEntity) to a NodeOrdinal. This transformation
|
| @@ -55,4 +54,4 @@ SYNC_EXPORT int64_t NodeOrdinalToInt64(const NodeOrdinal& ordinal);
|
|
|
| } // namespace syncer
|
|
|
| -#endif // SYNC_INTERNAL_API_PUBLIC_BASE_NODE_ORDINAL_H_
|
| +#endif // COMPONENTS_SYNC_BASE_NODE_ORDINAL_H_
|
|
|