commit | 35fe21779fddc0d376da13dab49e31fa3491205f | [log] [tgz] |
---|---|---|
author | Grace Cham <hscham@chromium.org> | Mon May 30 01:05:10 2022 |
committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | Thu Jun 02 02:08:29 2022 |
tree | fa22c2326c89f0ccbecf5d2e3635701867e62b85 | |
parent | 9e852aa145930d6ebb990d4e8f84e5907a1321de [diff] |
cbor: replace base::size with std::size Will be removed from base/cxx17_backports.h from libchrome r979799 (crrev.com/c/3511268). BUG=b:228144902 TEST=FEATURES=test emerge-hatch cbor Change-Id: Ibf5a16863a18b98695799f56ef25b04dee488e8e Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/cbor/+/3676632 Commit-Queue: Grace Cham <hscham@chromium.org> Tested-by: Grace Cham <hscham@chromium.org> Reviewed-by: Tom Hughes <tomhughes@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