Google Git
Sign in
chromium/chromiumos/platform/cbor/refs/heads/stabilize-15531.B
commit
bd1416be85fc5c317a2e6171be066ed98841e643
[log]
author
Georg Neis <[email protected]>
Tue Jan 24 07:42:43 2023
committer
Chromeos LUCI <[email protected]>
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 <[email protected]>
Tested-by: Georg Neis <[email protected]>
Commit-Queue: Georg Neis <[email protected]>
Reviewed-by: Jora Jacobi <[email protected]>
1 file changed
tree: 7266a528f4e14ef315147b65bc5f48bd7127e5b9
  1. reader_fuzzer_corpus/
  2. BUILD.gn
  3. cbor_export.h
  4. constants.h
  5. diagnostic_writer.cc
  6. diagnostic_writer.h
  7. diagnostic_writer_unittest.cc
  8. DIR_METADATA
  9. OWNERS
  10. reader.cc
  11. reader.h
  12. reader_fuzzer.cc
  13. reader_unittest.cc
  14. README.md
  15. values.cc
  16. values.h
  17. values_unittest.cc
  18. writer.cc
  19. writer.h
  20. writer_unittest.cc
README.md

cbor: Concise Binary Object Representation

This 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.

How to update the source

To pull in updates from chromium/src, do the following:

  • git remote update

  • git checkout -b main cros/main

  • git merge cros/upstream/main

    • Expect merge conflicts, because of the difference in header paths.
    • 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.
    • The #include paths should use the version from main (without “components/”). This should be the majority of the merge conflicts.
    • In the commit message of the merge, list the commits from upstream that are merged.
    • If you need to do make changes to the merged commits (outside of conflicts), do that work in separate commits. For example, if you need to revert commits, use 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.
    • Check the changes introduced by your merge by doing a diff against the commit before the merge. The difference should be the same as the changes in the upstream.

  • Push the resulting merge commit with:

    (chroot) $ git push HEAD:refs/for/main