Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix compile with protobuf 22-25. #2576

Merged
merged 1 commit into from
Mar 21, 2024

Conversation

ketor
Copy link
Contributor

@ketor ketor commented Mar 18, 2024

What problem does this PR solve?

Issue Number:

Problem Summary: PR #2546 在Protobuf 22-24这几个版本上的编译有一些问题,在25版本上可以编译通过。同时在Rocky 8.9的GCC 13上编译发现,原有的 #define private public的方式已经不被编译器接受,也会导致编译失败。

What is changed and the side effects?

Changed: 修复在Protobuf 22-24这3个版本上编译失败的问题。对于private的问题,对于高版本增加一个特殊处理解决编译问题。

Side effects:

  • Performance effects(性能影响): 无影响

  • Breaking backward compatibility(向后兼容性): 无影响


Check List:

  • Please make sure your changes are compilable(请确保你的更改可以通过编译).
  • When providing us with a new feature, it is best to add related tests(如果你向我们增加一个新的功能, 请添加相关测试).
  • Please follow Contributor Covenant Code of Conduct.(请遵循贡献者准则).

Signed-off-by: Ketor <d.ketor@gmail.com>
@wwbmmm wwbmmm merged commit e144702 into apache:master Mar 21, 2024
20 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants