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

Possibility to use without the dependency to file io and streams to use in intel sgx enclaves #2729

Merged
merged 6 commits into from
Jun 26, 2021
Merged

Possibility to use without the dependency to file io and streams to use in intel sgx enclaves #2729

merged 6 commits into from
Jun 26, 2021

Commits on Apr 21, 2021

  1. Fixes nlohmann#2728 

    includes some macros to be defined for using without file io.
    David Pfahler committed Apr 21, 2021
    Configuration menu
    Copy the full SHA
    1a1381f View commit details
    Browse the repository at this point in the history

  2. fixed amalgation file for nlohmann#2728

    David Pfahler committed Apr 21, 2021
    Configuration menu
    Copy the full SHA
    0a2de2f View commit details
    Browse the repository at this point in the history

Commits on May 31, 2021

  1. include io only if JSON_NO_IO is not set for nlohmann#2728

    David Pfahler committed May 31, 2021
    Configuration menu
    Copy the full SHA
    ae9bbbc View commit details
    Browse the repository at this point in the history

  2. fixed amalgation file for nlohmann#2728

    David Pfahler committed May 31, 2021
    Configuration menu
    Copy the full SHA
    e939b59 View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2021

  1. Merge branch 'nlohmann:develop' into without-io

    @theShmoo
    theShmoo committed Jun 14, 2021
    Configuration menu
    Copy the full SHA
    aa849a2 View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2021

  1. Merge branch 'nlohmann:develop' into without-io

    @theShmoo
    theShmoo committed Jun 15, 2021
    Configuration menu
    Copy the full SHA
    572343b View commit details
    Browse the repository at this point in the history