Merge pull request #2673 from remyjette/remove-exception-annotation

Remove HEDLEY annotation from exception::what()

Merge pull request #2673 from remyjette/remove-exception-annotation
Remove HEDLEY annotation from exception::what()
6b74772f · Niels Lohmann · GitHub · 80e7d6fd · 0a9ec38f · 6b74772f
Unverified Commit 6b74772f authored Mar 23, 2021 by Niels Lohmann Committed by GitHub Mar 23, 2021
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 2 deletions

include/nlohmann/detail/exceptions.hpp include/nlohmann/detail/exceptions.hpp +0 -1

single_include/nlohmann/json.hpp single_include/nlohmann/json.hpp +0 -1

No files found.
--- a/include/nlohmann/detail/exceptions.hpp
+++ b/include/nlohmann/detail/exceptions.hpp
@@ -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();

--- a/single_include/nlohmann/json.hpp
+++ b/single_include/nlohmann/json.hpp
@@ -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();