Merge branch 'develop' of https://github.com/nlohmann/json into ci

README.md

@@ -579,7 +579,7 @@ bool foo = j.at(2);
 j == R"(["foo", 1, true, 1.78])"_json;  // true
 
 // other stuff
-j.size();     // 3 entries
+j.size();     // 4 entries
 j.empty();    // false
 j.type();     // json::value_t::array
 j.clear();    // the array is empty again

doc/mkdocs/docs/features/parsing/parse_exceptions.md

@@ -8,7 +8,7 @@ try
 {
     j = json::parse(my_input);
 }
-catch (json::exception::parse_error& ex)
+catch (json::parse_error& ex)
 {
     std::cerr << "parse error at byte " << ex.byte << std::endl;
 }

include/nlohmann/detail/exceptions.hpp

@@ -50,7 +50,6 @@ class exception : public std::exception
 {
   public:
     /// returns the explanatory string
-    JSON_HEDLEY_RETURNS_NON_NULL
     const char* what() const noexcept override
     {
         return m.what();

single_include/nlohmann/json.hpp

@@ -2637,7 +2637,6 @@ class exception : public std::exception
 {
   public:
     /// returns the explanatory string
-    JSON_HEDLEY_RETURNS_NON_NULL
     const char* what() const noexcept override
     {
         return m.what();