Skip to content

[C++] Refactor uint128#8416

Merged
acozzette merged 5 commits intoprotocolbuffers:masterfrom
Yannic:uint128
Mar 30, 2021
Merged

[C++] Refactor uint128#8416
acozzette merged 5 commits intoprotocolbuffers:masterfrom
Yannic:uint128

Conversation

@Yannic
Copy link
Copy Markdown
Contributor

@Yannic Yannic commented Mar 20, 2021

This makes it compatible with absl::uint128

@Yannic
[C++] Refactor uint128
7efa91b 
This makes it compatible with absl::uint128
@google-cla google-cla Bot added the cla: yes label Mar 20, 2021
acozzette
acozzette reviewed Mar 23, 2021
View reviewed changes
Comment thread src/google/protobuf/stubs/int128.h Outdated
acozzette
acozzette reviewed Mar 24, 2021
View reviewed changes
Comment thread src/google/protobuf/stubs/int128_unittest.cc
@acozzette acozzette merged commit b604419 into protocolbuffers:master Mar 30, 2021
@acozzette
Copy link
Copy Markdown

acozzette commented Mar 30, 2021

Thanks, @Yannic.

@lipnitsk
Copy link
Copy Markdown

lipnitsk commented Apr 1, 2021

This broke external code depending on descriptor.pb.h.

Step #4: In file included from /src/protobuf-install/include/google/protobuf/descriptor.pb.h:23:
Step #4: In file included from /src/protobuf-install/include/google/protobuf/io/coded_stream.h:148:
Step #4: /src/protobuf-install/include/google/protobuf/stubs/logging.h:34:10: fatal error: 'google/protobuf/stubs/int128.h' file not found
Step #4: #include <google/protobuf/stubs/int128.h>
Step #4:          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=32763
Link: https://oss-fuzz-build-logs.storage.googleapis.com/log-b9d0c99a-00b5-4af7-862c-f16a5a11c457.txt

acozzette pushed a commit to acozzette/protobuf that referenced this pull request Apr 2, 2021
Revert "[C++] Refactor uint128 (protocolbuffers#8416)"
398d344 
This reverts commit b604419.
@acozzette
Copy link
Copy Markdown

acozzette commented Apr 2, 2021

@lipnitsk Thanks for the heads-up, let's roll back this change until we have a chance to come up with a fix. I will sent out a pull request in just a second.

@acozzette acozzette mentioned this pull request Apr 2, 2021
Merged
acozzette pushed a commit that referenced this pull request Apr 2, 2021
Revert "[C++] Refactor uint128 (#8416)"
6007999 
This reverts commit b604419.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@acozzette acozzette acozzette left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

c++ cla: yes

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@Yannic @acozzette @lipnitsk @protobuf-kokoro