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

Add conversion from/to std::optional #2117

Closed
wants to merge 16 commits into from
Closed

Add conversion from/to std::optional #2117

wants to merge 16 commits into from

Commits on Nov 22, 2019

  1. 🚧 conversions for std::optional

    @nlohmann
    nlohmann committed Nov 22, 2019
    Configuration menu
    Copy the full SHA
    df30a0e View commit details
    Browse the repository at this point in the history

Commits on Nov 23, 2019

  1. 🏁 fix <optional> inclusion

    @nlohmann
    nlohmann committed Nov 23, 2019
    Configuration menu
    Copy the full SHA
    1359c56 View commit details
    Browse the repository at this point in the history

  2. 💚 overwork tests

    @nlohmann
    nlohmann committed Nov 23, 2019
    Configuration menu
    Copy the full SHA
    713038f View commit details
    Browse the repository at this point in the history

Commits on Dec 17, 2019

  1. Use JSON_HAS_CPP_17 only after it has been defined

    @remedi
    remedi committed Dec 17, 2019
    Configuration menu
    Copy the full SHA
    1b846c9 View commit details
    Browse the repository at this point in the history

Commits on Dec 18, 2019

  1. Merge pull request #1872 from remedi/feature/optional 

    Use JSON_HAS_CPP_17 only after it has been defined
    @nlohmann
    nlohmann authored Dec 18, 2019
    Configuration menu
    Copy the full SHA
    a2fea87 View commit details
    Browse the repository at this point in the history

Commits on Dec 19, 2019

  1. ⚗️ set CXXFLAGS

    @nlohmann
    nlohmann committed Dec 19, 2019
    Configuration menu
    Copy the full SHA
    6b31375 View commit details
    Browse the repository at this point in the history

Commits on May 16, 2020

  1. Merge branches 'develop' and 'feature/optional' of https://github.com… 

    …/nlohmann/json into feature/optional
    @nlohmann
    nlohmann committed May 16, 2020
    Configuration menu
    Copy the full SHA
    71c80cc View commit details
    Browse the repository at this point in the history

  2. ✅ update tests

    @nlohmann
    nlohmann committed May 16, 2020
    Configuration menu
    Copy the full SHA
    007c6c4 View commit details
    Browse the repository at this point in the history

Commits on May 17, 2020

  1. 🏁 include right <optional> header

    @nlohmann
    nlohmann committed May 17, 2020
    Configuration menu
    Copy the full SHA
    f25bf31 View commit details
    Browse the repository at this point in the history

Commits on May 20, 2020

  1. Merge branches 'develop' and 'feature/optional' of https://github.com… 

    …/nlohmann/json into feature/optional
    @nlohmann
    nlohmann committed May 20, 2020
    Configuration menu
    Copy the full SHA
    b61d563 View commit details
    Browse the repository at this point in the history

Commits on Aug 7, 2020

  1. Merge branch 'develop' of https://github.com/nlohmann/json into featu… 

    …re/optional
    @nlohmann
    nlohmann committed Aug 7, 2020
    Configuration menu
    Copy the full SHA
    fedf82c View commit details
    Browse the repository at this point in the history

Commits on Dec 21, 2020

  1. Merge branch 'develop' of https://github.com/nlohmann/json into featu… 

    …re/optional

� Conflicts:
�	test/src/unit-conversions.cpp
    @nlohmann
    nlohmann committed Dec 21, 2020
    Configuration menu
    Copy the full SHA
    5e55158 View commit details
    Browse the repository at this point in the history

Commits on Dec 30, 2020

  1. Merge branch 'develop' of https://github.com/nlohmann/json into featu… 

    …re/optional

� Conflicts:
�	test/src/unit-conversions.cpp
    @nlohmann
    nlohmann committed Dec 30, 2020
    Configuration menu
    Copy the full SHA
    ebb63bd View commit details
    Browse the repository at this point in the history

Commits on Jan 3, 2021

  1. ♻️ do not include experimental headers

    @nlohmann
    nlohmann committed Jan 3, 2021
    Configuration menu
    Copy the full SHA
    f1913fe View commit details
    Browse the repository at this point in the history

  2. 🔥 remove useless line

    @nlohmann
    nlohmann committed Jan 3, 2021
    Configuration menu
    Copy the full SHA
    384442e View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' of https://github.com/nlohmann/json into featu… 

    …re/optional
    @nlohmann
    nlohmann committed Jan 3, 2021
    Configuration menu
    Copy the full SHA
    7ffd3ae View commit details
    Browse the repository at this point in the history