Skip to content

Make library work with Clang on Windows#2259

Merged
nlohmann merged 29 commits intodevelopfrom
clang_windows
Jul 12, 2020
Merged

Make library work with Clang on Windows#2259
nlohmann merged 29 commits intodevelopfrom
clang_windows

Conversation

@nlohmann
Copy link
Owner

@nlohmann nlohmann commented Jul 11, 2020

This PR makes the library work with Clang on Windows:

  • Add a GitHub Action with Clang 9 and Clang 10 on Windows.
  • Replace all alternative operators and, or, not with &&, ||, !, respectively.
  • Remove a test case where Clang is choking on.

Closes #1818.
Closes #1119.
Closes #1898.

nlohmann added 27 commits May 30, 2020 13:07
…_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
…_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
@t-b
Copy link
Contributor

t-b commented Jul 11, 2020

@nlohmann I guess include/nlohmann/detail/boolean_operators.hpp can then go as well?

@nlohmann
Copy link
Owner Author

@nlohmann I guess include/nlohmann/detail/boolean_operators.hpp can then go as well?

Good catch!

@coveralls
Copy link

coveralls commented Jul 11, 2020

Coverage Status

Coverage remained the same at 100.0% when pulling 4d28694 on clang_windows into cbafed3 on develop.

@nlohmann nlohmann merged commit 4868129 into develop Jul 12, 2020
@nlohmann nlohmann deleted the clang_windows branch July 12, 2020 11:09
@nlohmann
Copy link
Owner Author


🔖 Release item

This issue/PR will be part of the next release of the library. This template helps preparing the release notes.

Type

  • ✨ New Feature
  • 🐛 Bug Fix
  • ⚡️ Improvement
  • 🔨 Further Change
  • 🔥 Deprecated function

Description


Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

3 participants