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

Make library work with Clang on Windows #2259

Merged
merged 29 commits into from
Jul 12, 2020
Merged

Make library work with Clang on Windows #2259

merged 29 commits into from
Jul 12, 2020

Commits on May 30, 2020

  1. 👷 add Clang/Windows step

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

  2. 👷 use Clang compiler

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

  3. 👷 use Makefiles

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

  4. 👷 set full path

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

  5. 👷 install clang

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

  6. 👷 install clang

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

  7. 👷 install clang

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

  8. 👷 install clang

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

  9. 👷 install clang

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

  10. 👷 install clang

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

  11. 👷 install clang

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

  12. 👷 install clang

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

Commits on Jun 3, 2020

  1. Merge branches 'clang_windows' and 'develop' of https://github.com/nl… 

    …ohmann/json into clang_windows
    @nlohmann
    nlohmann committed Jun 3, 2020
    Configuration menu
    Copy the full SHA
    4f04ea1 View commit details
    Browse the repository at this point in the history

  2. 🎨 replace alternative operators (and, not, or)

    @nlohmann
    nlohmann committed Jun 3, 2020
    Configuration menu
    Copy the full SHA
    0498202 View commit details
    Browse the repository at this point in the history

  3. 🎨 replace alternative operators (and, not, or)

    @nlohmann
    nlohmann committed Jun 3, 2020
    Configuration menu
    Copy the full SHA
    65c4b07 View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2020

  1. 👷 try Clang 10

    @nlohmann
    nlohmann committed Jun 4, 2020
    Configuration menu
    Copy the full SHA
    402c34c View commit details
    Browse the repository at this point in the history

  2. 👷 try Clang 10

    @nlohmann
    nlohmann committed Jun 4, 2020
    Configuration menu
    Copy the full SHA
    dc32331 View commit details
    Browse the repository at this point in the history

  3. 👷 try Clang 8

    @nlohmann
    nlohmann committed Jun 4, 2020
    Configuration menu
    Copy the full SHA
    a53e3a5 View commit details
    Browse the repository at this point in the history

  4. 👷 remove Clang 8

    @nlohmann
    nlohmann committed Jun 4, 2020
    Configuration menu
    Copy the full SHA
    24e8562 View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2020

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

    …_windows

� Conflicts:
�	include/nlohmann/detail/input/binary_reader.hpp
�	include/nlohmann/detail/input/input_adapters.hpp
�	include/nlohmann/detail/input/lexer.hpp
�	include/nlohmann/detail/output/binary_writer.hpp
�	include/nlohmann/json.hpp
�	single_include/nlohmann/json.hpp
    @nlohmann
    nlohmann committed Jun 27, 2020
    Configuration menu
    Copy the full SHA
    ac3922c View commit details
    Browse the repository at this point in the history

  2. 🔀 merge from develop

    @nlohmann
    nlohmann committed Jun 27, 2020
    Configuration menu
    Copy the full SHA
    d7a2956 View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2020

  1. ♻️ replace further alternative operators

    @nlohmann
    nlohmann committed Jul 11, 2020
    Configuration menu
    Copy the full SHA
    609a004 View commit details
    Browse the repository at this point in the history

  2. 🏁 remove failing code for Clang/Windows

    @nlohmann
    nlohmann committed Jul 11, 2020
    Configuration menu
    Copy the full SHA
    b2240f7 View commit details
    Browse the repository at this point in the history

  3. ♻️ replace further alternative operators

    @nlohmann
    nlohmann committed Jul 11, 2020
    Configuration menu
    Copy the full SHA
    889f269 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop' of https://github.com/nlohmann/json into clang… 

    …_windows

� Conflicts:
�	include/nlohmann/detail/input/binary_reader.hpp
�	include/nlohmann/detail/input/json_sax.hpp
�	include/nlohmann/detail/input/lexer.hpp
�	include/nlohmann/detail/input/parser.hpp
�	include/nlohmann/detail/json_pointer.hpp
�	include/nlohmann/detail/output/serializer.hpp
�	include/nlohmann/json.hpp
�	single_include/nlohmann/json.hpp
    @nlohmann
    nlohmann committed Jul 11, 2020
    Configuration menu
    Copy the full SHA
    dc06f10 View commit details
    Browse the repository at this point in the history

  5. 🔀 merge develop branch and resolve conflicts

    @nlohmann
    nlohmann committed Jul 11, 2020
    Configuration menu
    Copy the full SHA
    7f92342 View commit details
    Browse the repository at this point in the history

  6. ♻️ replace further alternative operators

    @nlohmann
    nlohmann committed Jul 11, 2020
    Configuration menu
    Copy the full SHA
    6477b9b View commit details
    Browse the repository at this point in the history

  7. 🔥 remove unused boolean_operators.hpp header

    @nlohmann
    nlohmann committed Jul 11, 2020
    Configuration menu
    Copy the full SHA
    8d29523 View commit details
    Browse the repository at this point in the history

  8. ♻️ replace further alternative operators

    @nlohmann
    nlohmann committed Jul 11, 2020
    Configuration menu
    Copy the full SHA
    4d28694 View commit details
    Browse the repository at this point in the history