🔀 merge from develop

2020-06-27 13:16:20 +02:00 · 2020-06-27 13:16:20 +02:00 · d7a2956b24
commit d7a2956b24
parent ac3922c7aa
3 changed files with 626 additions and 625 deletions
--- a/include/nlohmann/detail/input/lexer.hpp
+++ b/include/nlohmann/detail/input/lexer.hpp
@ -1511,7 +1511,7 @@ scan_number_done:
        skip_whitespace();
        // ignore comments
-        if (ignore_comments and current == '/')
+        if (ignore_comments && current == '/')
        {
            if (not scan_comment())
            {
--- a/single_include/nlohmann/json.hpp
+++ b/single_include/nlohmann/json.hpp