j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

🔨 add NLOHMANN_JSON prefix and undef macros

Browse source
This commit is contained in:
Niels Lohmann 2019-07-01 22:24:39 +02:00
parent 1720bfedd1
commit 897362191d
No known key found for this signature in database
GPG key ID: 7F3CEA63AE251B69
20 changed files with 4055 additions and 2294 deletions
Download patch file Download diff file Expand all files Collapse all files

12
include/nlohmann/detail/exceptions.hpp
View file

@ -47,7 +47,7 @@ class exception : public std::exception
{
public:
/// returns the explanatory string
HEDLEY_RETURNS_NON_NULL
NLOHMANN_JSON_HEDLEY_RETURNS_NON_NULL
const char* what() const noexcept override
{
return m.what();
@ -57,7 +57,7 @@ class exception : public std::exception
const int id;
protected:
HEDLEY_NON_NULL(3)
NLOHMANN_JSON_HEDLEY_NON_NULL(3)
exception(int id_, const char* what_arg) : id(id_), m(what_arg) {}
static std::string name(const std::string& ename, int id_)
@ -210,7 +210,7 @@ class invalid_iterator : public exception
}
private:
HEDLEY_NON_NULL(3)
NLOHMANN_JSON_HEDLEY_NON_NULL(3)
invalid_iterator(int id_, const char* what_arg)
: exception(id_, what_arg) {}
};
@ -264,7 +264,7 @@ class type_error : public exception
}
private:
HEDLEY_NON_NULL(3)
NLOHMANN_JSON_HEDLEY_NON_NULL(3)
type_error(int id_, const char* what_arg) : exception(id_, what_arg) {}
};
@ -311,7 +311,7 @@ class out_of_range : public exception
}
private:
HEDLEY_NON_NULL(3)
NLOHMANN_JSON_HEDLEY_NON_NULL(3)
out_of_range(int id_, const char* what_arg) : exception(id_, what_arg) {}
};
@ -349,7 +349,7 @@ class other_error : public exception
}
private:
HEDLEY_NON_NULL(3)
NLOHMANN_JSON_HEDLEY_NON_NULL(3)
other_error(int id_, const char* what_arg) : exception(id_, what_arg) {}
};
} // namespace detail