Merge branch 'develop' into feature/manual_lexer

README.md

@@ -10,6 +10,7 @@
 [![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/nlohmann/json/master/LICENSE.MIT)
 [![Github Releases](https://img.shields.io/github/release/nlohmann/json.svg)](https://github.com/nlohmann/json/releases)
 [![Github Issues](https://img.shields.io/github/issues/nlohmann/json.svg)](http://github.com/nlohmann/json/issues)
+[![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/nlohmann/json.svg)](http://isitmaintained.com/project/nlohmann/json "Average time to resolve an issue")
 [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/289/badge)](https://bestpractices.coreinfrastructure.org/projects/289)
 
 - [Design goals](#design-goals)
@@ -835,6 +836,7 @@ I deeply appreciate the help of the following people.
 - [Krzysztof Woś](https://github.com/krzysztofwos) made exceptions more visible.
 - [ftillier](https://github.com/ftillier) fixed a compiler warning.
 - [tinloaf](https://github.com/tinloaf) made sure all pushed warnings are properly popped.
+- [Fytch](https://github.com/Fytch) found a bug in the documentation.
 
 Thanks a lot for helping out! Please [let me know](mailto:mail@nlohmann.me) if I forgot someone.
 

doc/index.md

@@ -27,6 +27,7 @@ These pages contain the API documentation of JSON for Modern C++, a C++11 header
     - @link nlohmann::basic_json::get_ptr get_ptr @endlink -- get a value pointer
     - @link nlohmann::basic_json::get_ref get_ref @endlink -- get a value reference
     - @link nlohmann::basic_json::operator ValueType() const operator ValueType @endlink -- get a value (implicit conversion)
+    - @link nlohmann::basic_json::value value @endlink -- get a value from an object and return default value if key is not present
   - lexicographical comparison operators
   - serialization
   - deserialization
@@ -254,21 +255,21 @@ The container functions known from STL have been extended to support the differe
   <tr>
     <td rowspan="2">lookup</td>
     <td>`find`</td>
-    <td class="ok_green">@link nlohmann::basic_json::find `find` @endlink (returns `end()`)</td>
     <td class="ok_green">@link nlohmann::basic_json::find `find` @endlink</td>
     <td class="ok_green">@link nlohmann::basic_json::find `find` @endlink (returns `end()`)</td>
     <td class="ok_green">@link nlohmann::basic_json::find `find` @endlink (returns `end()`)</td>
     <td class="ok_green">@link nlohmann::basic_json::find `find` @endlink (returns `end()`)</td>
     <td class="ok_green">@link nlohmann::basic_json::find `find` @endlink (returns `end()`)</td>
+    <td class="ok_green">@link nlohmann::basic_json::find `find` @endlink (returns `end()`)</td>
   </tr>
   <tr>
     <td>`count`</td>
-    <td class="ok_green">@link nlohmann::basic_json::count `count` @endlink (returns `0`)</td>
     <td class="ok_green">@link nlohmann::basic_json::count `count` @endlink</td>
     <td class="ok_green">@link nlohmann::basic_json::count `count` @endlink (returns `0`)</td>
     <td class="ok_green">@link nlohmann::basic_json::count `count` @endlink (returns `0`)</td>
     <td class="ok_green">@link nlohmann::basic_json::count `count` @endlink (returns `0`)</td>
     <td class="ok_green">@link nlohmann::basic_json::count `count` @endlink (returns `0`)</td>
+    <td class="ok_green">@link nlohmann::basic_json::count `count` @endlink (returns `0`)</td>
   </tr>
 </table>
 

src/json.hpp

@@ -3740,7 +3740,7 @@ class basic_json
 #ifndef _MSC_VER  // fix for issue #167 operator<< ambiguity under VS2015
                    and not std::is_same<ValueType, std::initializer_list<typename string_t::value_type>>::value
 #endif
-#if defined(_MSC_VER) && defined(_HAS_CXX17) && _HAS_CXX17 == 1 // fix for issue #464
+#if defined(_MSC_VER) && _MSC_VER >1900 && defined(_HAS_CXX17) && _HAS_CXX17 == 1 // fix for issue #464
                    and not std::is_same<ValueType, typename std::string_view>::value
 #endif
                    , int >::type = 0 >