External/json
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

🔨 reverted changes that led to Travis failures

Browse Source
This commit is contained in:
Niels Lohmann 2017-03-26 12:23:10 +02:00
parent 53b501a785
commit 3336194306
No known key found for this signature in database
GPG Key ID: 7F3CEA63AE251B69
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/json.hpp
View File

@ -136,7 +136,7 @@ class exception : public std::exception
const int id;
protected:
exception(int id_, const char* what_arg) noexcept(noexcept(std::runtime_error(what_arg)))
exception(int id_, const char* what_arg)
: id(id_), m(what_arg)
{}
@ -185,7 +185,7 @@ json.exception.parse_error.113 | parse error at 2: expected a CBOR string; last
@since version 3.0.0
*/
class parse_error : private exception
class parse_error : public exception
{
public:
/*!
@ -217,7 +217,7 @@ class parse_error : private exception
const size_t byte;
private:
parse_error(int id, size_t byte_, const char* what_arg) noexcept(noexcept(std::runtime_error(what_arg)))
parse_error(int id, size_t byte_, const char* what_arg)
: exception(id, what_arg), byte(byte_)
{}
};
@ -256,7 +256,7 @@ class invalid_iterator : public exception
}
private:
invalid_iterator(int id, const char* what_arg) noexcept(noexcept(std::runtime_error(what_arg)))
invalid_iterator(int id, const char* what_arg)
: exception(id, what_arg)
{}
};
@ -295,7 +295,7 @@ class type_error : public exception
}
private:
type_error(int id, const char* what_arg) noexcept(noexcept(std::runtime_error(what_arg)))
type_error(int id, const char* what_arg)
: exception(id, what_arg)
{}
};
@ -326,7 +326,7 @@ class out_of_range : public exception
}
private:
out_of_range(int id, const char* what_arg) noexcept(noexcept(std::runtime_error(what_arg)))
out_of_range(int id, const char* what_arg)
: exception(id, what_arg)
{}
};
@ -352,7 +352,7 @@ class other_error : public exception
}
private:
other_error(int id, const char* what_arg) noexcept(noexcept(std::runtime_error(what_arg)))
other_error(int id, const char* what_arg)
: exception(id, what_arg)
{}
};

12
src/json.hpp.re2c
View File

@ -136,7 +136,7 @@ class exception : public std::exception
const int id;
protected:
exception(int id_, const char* what_arg) noexcept(noexcept(std::runtime_error(what_arg)))
exception(int id_, const char* what_arg)
: id(id_), m(what_arg)
{}
@ -217,7 +217,7 @@ class parse_error : public exception
const size_t byte;
private:
parse_error(int id, size_t byte_, const char* what_arg) noexcept(noexcept(std::runtime_error(what_arg)))
parse_error(int id, size_t byte_, const char* what_arg)
: exception(id, what_arg), byte(byte_)
{}
};
@ -256,7 +256,7 @@ class invalid_iterator : public exception
}
private:
invalid_iterator(int id, const char* what_arg) noexcept(noexcept(std::runtime_error(what_arg)))
invalid_iterator(int id, const char* what_arg)
: exception(id, what_arg)
{}
};
@ -295,7 +295,7 @@ class type_error : public exception
}
private:
type_error(int id, const char* what_arg) noexcept(noexcept(std::runtime_error(what_arg)))
type_error(int id, const char* what_arg)
: exception(id, what_arg)
{}
};
@ -326,7 +326,7 @@ class out_of_range : public exception
}
private:
out_of_range(int id, const char* what_arg) noexcept(noexcept(std::runtime_error(what_arg)))
out_of_range(int id, const char* what_arg)
: exception(id, what_arg)
{}
};
@ -352,7 +352,7 @@ class other_error : public exception
}
private:
other_error(int id, const char* what_arg) noexcept(noexcept(std::runtime_error(what_arg)))
other_error(int id, const char* what_arg)
: exception(id, what_arg)
{}
};