commit | bd1416be85fc5c317a2e6171be066ed98841e643 | [log] [tgz] |
---|---|---|
author | Georg Neis <neis@chromium.org> | Tue Jan 24 07:42:43 2023 |
committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | Fri Jan 27 04:30:26 2023 |
tree | 7266a528f4e14ef315147b65bc5f48bd7127e5b9 | |
parent | 55b123398489027c07a31f4e0fdb3613aef8695d [diff] |
Explicitly #include <ostream> libchrome will soon include Chromium change crrev.com/1092231, which removes an include of <ostream> from base/numerics/safe_conversions.h. cbor's writer.cc needs such an include for NOTREACHED() << ... Also update copyright notice to pass presubmit checks. BUG=b:266510143 TEST=emerge cbor Change-Id: If6464ef84f998b4baea627c780d0d31f57d66656 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/cbor/+/4189742 Auto-Submit: Georg Neis <neis@chromium.org> Tested-by: Georg Neis <neis@chromium.org> Commit-Queue: Georg Neis <neis@chromium.org> Reviewed-by: Jora Jacobi <jora@google.com>
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