Skip to content

Commit

Permalink
Merge pull request #2673 from remyjette/remove-exception-annotation
Browse files Browse the repository at this point in the history
Remove HEDLEY annotation from exception::what()
  • Loading branch information
nlohmann authored Mar 23, 2021
2 parents 80e7d6f + 0a9ec38 commit 6b74772
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 2 deletions.
1 change: 0 additions & 1 deletion include/nlohmann/detail/exceptions.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,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();
Expand Down
1 change: 0 additions & 1 deletion single_include/nlohmann/json.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -2640,7 +2640,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();
Expand Down

0 comments on commit 6b74772

Please sign in to comment.