🔀 merge from develop

include/nlohmann/detail/input/input_adapters.hpp

@@ -403,9 +403,9 @@ using contiguous_bytes_input_adapter = decltype(input_adapter(std::declval<const
 // Null-delimited strings, and the like.
 template < typename CharT,
            typename std::enable_if <
-               std::is_pointer<CharT>::value &&
-               not std::is_array<CharT>::value &&
-               std::is_integral<typename std::remove_pointer<CharT>::type>::value &&
+               std::is_pointer<CharT>::value&&
+               not std::is_array<CharT>::value&&
+               std::is_integral<typename std::remove_pointer<CharT>::type>::value&&
                sizeof(typename std::remove_pointer<CharT>::type) == 1,
                int >::type = 0 >
 contiguous_bytes_input_adapter input_adapter(CharT 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())
             {