Skip to content

J
json
Commit 67a06834 by Niels Lohmann Committed by GitHub
Options

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

Make exception base class visible in basic_json
parents 31a6c091 b9c3b8d6
Showing with 8 additions and 1 deletion
Makefile
.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 ...@@ -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
......
src/json.hpp
...@@ -1264,6 +1264,8 @@ class basic_json ...@@ -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
......
src/json.hpp.re2c
...@@ -1264,6 +1264,8 @@ class basic_json ...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment