commit | 22ce639d21a6607f23d0c1893a12550613164a83 | [log] [tgz] |
---|---|---|
author | Ryo Hashimoto <hashimoto@chromium.org> | Thu Feb 08 12:11:39 2024 |
committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | Tue Feb 13 03:49:13 2024 |
tree | ee9f176bc87bfbbd7ff3ef3ac89eddd5e6dc9611 | |
parent | bd1416be85fc5c317a2e6171be066ed98841e643 [diff] |
Use base::checked_cast to convert uint64_t to size_t Do the same thing as http://crrev.com/c/5213529 BUG=b:324173685 TEST=cros_run_unit_tests --board=hana --packages cbor Change-Id: I22b877d314f6f0af9b67d7fb87211311bcdb5a44 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/cbor/+/5274069 Reviewed-by: Tom Hughes <tomhughes@chromium.org> Commit-Queue: Ryo Hashimoto <hashimoto@chromium.org> Tested-by: Ryo Hashimoto <hashimoto@chromium.org>
cbor
: Concise Binary Object RepresentationThis library is a partial implementation of the RFC 7049 Concise Binary Object Representation standard.
The source code was fetched from chromium/src
in order to avoid code duplication.
The cros/upstream/main
branch is a mirror of the components/cbor
directory from upstream. It is automatically updated to reflect the latest changes in upstream.
To pull in updates from chromium/src
, do the following:
git remote update
git checkout -b main cros/main
git merge cros/upstream/main
OWNERS
should use the version from main
.BUILD.gn
should mostly use the version from main
, unless the upstream changes the files to be built.#include
paths should use the version from main
(without “components/”). This should be the majority of the merge conflicts.git revert
after committing the merge commit. This preserves the history and makes it clear why a change is being reverted rather than quietly changing it in the merge commit.Push the resulting merge commit with:
(chroot) $ git push HEAD:refs/for/main