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.

Sign up for GitHub

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

Jump to bottom

[fix][compile] Resolve time_point type mismatch on MacOS and Linux #38049

Merged
merged 1 commit into from
Jul 18, 2024
Merged

[fix][compile] Resolve time_point type mismatch on MacOS and Linux #38049

merged 1 commit into from
Jul 18, 2024

Conversation

zy-kkk
Copy link
Member

@zy-kkk zy-kkk commented Jul 18, 2024

revert #38036
We cannot change the time_point type directly, but use macros to distinguish different compilation platforms, refer to #34054

@doris-robot
Copy link

Thank you for your contribution to Apache Doris.
Don't know what should be done next? See How to process your PR

Since 2024-03-18, the Document has been moved to doris-website.
See Doris Document.

@zy-kkk
Copy link
Member Author

zy-kkk commented Jul 18, 2024

run buildall

@github-actions GitHub Actions
Copy link
Contributor

PR approved by anyone and no changes requested.

@github-actions GitHub Actions
Copy link
Contributor

PR approved by at least one committer and no changes requested.

@github-actions github-actions bot added the approved Indicates a PR has been approved by one committer. label Jul 18, 2024
@zy-kkk zy-kkk merged commit ba0eb23 into apache:master Jul 18, 2024
29 of 30 checks passed
@zy-kkk zy-kkk deleted the fix_mac_0718 branch July 18, 2024 06:39
dataroaring pushed a commit that referenced this pull request Jul 19, 2024
@zy-kkk @dataroaring
[fix][compile] Resolve time_point type mismatch on MacOS and Linux (#…
ade14e4 
…38049)

revert #38036
We cannot change the time_point type directly, but use macros to
distinguish different compilation platforms, refer to #34054
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@morningman morningman morningman approved these changes

@ByteYue ByteYue ByteYue approved these changes

Assignees
No one assigned
Labels
approved Indicates a PR has been approved by one committer. dev/3.0.1-merged reviewed
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@zy-kkk @doris-robot @morningman @ByteYue @dataroaring