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

Merge v0.15 changes back into master #140

Merged
merged 13 commits into from
Oct 12, 2022
Merged

Merge v0.15 changes back into master #140

merged 13 commits into from
Oct 12, 2022

Conversation

tov
Copy link
Contributor

@tov tov commented Oct 12, 2022

No description provided.

aalekseyev and others added 13 commits February 15, 2022 14:18
Signed-off-by: Kate <kit.ty.kate@disroot.org>
Signed-off-by: Aaron L. Zeng <me@bcc32.com>
Base hasn't supported OCaml 4.03 and earlier since v0.9

Signed-off-by: David Allsopp <david.allsopp@metastack.com>
Signed-off-by: David Allsopp <david.allsopp@metastack.com>
Signed-off-by: David Allsopp <david.allsopp@metastack.com>
…omise_no_mutation

Signed-off-by: Jesse Tov <jtov@janestreet.com>

Co-authored-by: hhugo <hugo.heuzard@gmail.com>
Building in dev mode was failing because `round_nearest` could
not be inlined at a call from `int63_round_nearest_portable_alloc_exn`
that was annotated [@ocaml.inlined always]. This commit fixes that by
defining `round_nearest_inline` with an [@ocaml.inline] annotation,
and then using that to define both `round_nearest` and
`int63_round_nearest_portable_alloc_exn`.

Signed-off-by: Jesse Tov <jtov@janestreet.com>
Signed-off-by: Jesse Tov <jtov@janestreet.com>
Signed-off-by: Jesse Tov <jtov@janestreet.com>
Signed-off-by: Jesse Tov <jtov@janestreet.com>
Signed-off-by: Jesse Tov <jtov@janestreet.com>
Signed-off-by: Jesse Tov <jtov@janestreet.com>
@tov tov requested a review from staronj October 12, 2022 15:33
@staronj staronj merged commit 65ef267 into master Oct 12, 2022
@tov tov deleted the v0.15-back-to-master branch October 12, 2022 15:57
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.

7 participants