Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
json
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Libraries
json
Commits
33361943
Unverified
Commit
33361943
authored
Mar 26, 2017
by
Niels Lohmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
🔨
reverted changes that led to Travis failures
parent
53b501a7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
13 deletions
+13
-13
src/json.hpp
src/json.hpp
+7
-7
src/json.hpp.re2c
src/json.hpp.re2c
+6
-6
No files found.
src/json.hpp
View file @
33361943
...
...
@@ -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
:
p
rivate
exception
class
parse_error
:
p
ublic
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
)
{}
};
...
...
src/json.hpp.re2c
View file @
33361943
...
...
@@ -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)
{}
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment