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

feat: Rebase feature/optional to develop #4036

Merged
merged 16 commits into from
Nov 16, 2024
Merged

feat: Rebase feature/optional to develop #4036

merged 16 commits into from
Nov 16, 2024

Commits on Nov 13, 2024

  1. 🚧 conversions for std::optional

    @nlohmann @fsandhei
    nlohmann authored and fsandhei committed Nov 13, 2024
    Configuration menu
    Copy the full SHA
    a112a3a View commit details
    Browse the repository at this point in the history

  2. 🏁 fix <optional> inclusion

    @nlohmann @fsandhei
    nlohmann authored and fsandhei committed Nov 13, 2024
    Configuration menu
    Copy the full SHA
    a02f9b9 View commit details
    Browse the repository at this point in the history

  3. 💚 overwork tests

    @nlohmann @fsandhei
    nlohmann authored and fsandhei committed Nov 13, 2024
    Configuration menu
    Copy the full SHA
    7776939 View commit details
    Browse the repository at this point in the history

  4. Use JSON_HAS_CPP_17 only after it has been defined

    @remedi @fsandhei
    remedi authored and fsandhei committed Nov 13, 2024
    Configuration menu
    Copy the full SHA
    f4990ae View commit details
    Browse the repository at this point in the history

  5. ✅ update tests

    @nlohmann @fsandhei
    nlohmann authored and fsandhei committed Nov 13, 2024
    Configuration menu
    Copy the full SHA
    1e9eea5 View commit details
    Browse the repository at this point in the history

  6. 🏁 include right <optional> header

    @nlohmann @fsandhei
    nlohmann authored and fsandhei committed Nov 13, 2024
    Configuration menu
    Copy the full SHA
    7ffe2c4 View commit details
    Browse the repository at this point in the history

  7. ♻️ do not include experimental headers

    @nlohmann @fsandhei
    nlohmann authored and fsandhei committed Nov 13, 2024
    Configuration menu
    Copy the full SHA
    b432a61 View commit details
    Browse the repository at this point in the history

  8. Add missing #endif after rebase

    @fsandhei
    fsandhei committed Nov 13, 2024
    Configuration menu
    Copy the full SHA
    e6e9ff9 View commit details
    Browse the repository at this point in the history

  9. Fix failing test

    @fsandhei
    fsandhei committed Nov 13, 2024
    Configuration menu
    Copy the full SHA
    068e3fb View commit details
    Browse the repository at this point in the history

  10. Only define conversion to std::optional when JSON_USE_IMPLICIT_CONVER… 

    …SION is disabled.
    @fsandhei
    fsandhei committed Nov 13, 2024
    Configuration menu
    Copy the full SHA
    a37eeab View commit details
    Browse the repository at this point in the history

  11. missing endif

    @fsandhei
    fsandhei committed Nov 13, 2024
    Configuration menu
    Copy the full SHA
    2edff8e View commit details
    Browse the repository at this point in the history

  12. Remove Wfloat-equal suppress

    @fsandhei
    fsandhei committed Nov 13, 2024
    Configuration menu
    Copy the full SHA
    faa61f1 View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2024

  1. amalgamate

    @fsandhei
    fsandhei committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    a83e523 View commit details
    Browse the repository at this point in the history

  2. Move include of optional out of macro_scope; probably does not make s… 

    …ense to be there
    @fsandhei
    fsandhei committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    4341bef View commit details
    Browse the repository at this point in the history

  3. Make clang-tidy happy

    @fsandhei
    fsandhei committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    3a9ff36 View commit details
    Browse the repository at this point in the history

  4. Suppress lint instead of changing to 'contains'

    @fsandhei
    fsandhei committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    296549c View commit details
    Browse the repository at this point in the history