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

Merge pull request #526 from krzysztofwos/feature/exception-base-class

Browse source 
Make exception base class visible in basic_json
This commit is contained in:
Niels Lohmann 2017-03-22 07:50:34 +01:00 committed by GitHub
commit 67a06834b0
3 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Makefile
View file

@ -1,7 +1,7 @@
.PHONY: pretty clean ChangeLog.md .PHONY: pretty clean ChangeLog.md
# used programs # used programs
RE2C = re2c RE2C := $(shell command -v re2c 2> /dev/null)
SED = sed SED = sed
# main target # main target
@ -185,6 +185,9 @@ clang_sanitize: clean
# create scanner with re2c # create scanner with re2c
re2c: src/json.hpp.re2c re2c: src/json.hpp.re2c
ifndef RE2C
$(error "re2c is not available, please install re2c")
endif
$(RE2C) -W --utf-8 --encoding-policy fail --bit-vectors --nested-ifs --no-debug-info $< | $(SED) '1d' > src/json.hpp $(RE2C) -W --utf-8 --encoding-policy fail --bit-vectors --nested-ifs --no-debug-info $< | $(SED) '1d' > src/json.hpp
# pretty printer # pretty printer

2
src/json.hpp
View file

@ -1264,6 +1264,8 @@ class basic_json
/// Classes to implement user-defined exceptions. /// Classes to implement user-defined exceptions.
/// @{ /// @{
/// @copydoc detail::exception
using exception = detail::exception;
/// @copydoc detail::parse_error /// @copydoc detail::parse_error
using parse_error = detail::parse_error; using parse_error = detail::parse_error;
/// @copydoc detail::invalid_iterator /// @copydoc detail::invalid_iterator

2
src/json.hpp.re2c
View file

@ -1264,6 +1264,8 @@ class basic_json
/// Classes to implement user-defined exceptions. /// Classes to implement user-defined exceptions.
/// @{ /// @{
/// @copydoc detail::exception
using exception = detail::exception;
/// @copydoc detail::parse_error /// @copydoc detail::parse_error
using parse_error = detail::parse_error; using parse_error = detail::parse_error;
/// @copydoc detail::invalid_iterator /// @copydoc detail::invalid_iterator