Skip to content

Make exception base class visible in basic_json #526

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nlohmann merged 2 commits into from Mar 22, 2017
Merged

Make exception base class visible in basic_json #526

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8657920
Make exception base class visible in basic_json
krzysztofwos Mar 20, 2017
b9c3b8d
Exit with an error if re2c is not available
krzysztofwos Mar 20, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.PHONY: pretty clean ChangeLog.md

# used programs
RE2C = re2c
RE2C := $(shell command -v re2c 2> /dev/null)
SED = sed

# main target
Expand Down Expand Up @@ -185,6 +185,9 @@ clang_sanitize: clean

# create scanner with 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

# pretty printer
Expand Down
2 changes: 2 additions & 0 deletions src/json.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1264,6 +1264,8 @@ class basic_json
/// Classes to implement user-defined exceptions.
/// @{

/// @copydoc detail::exception
using exception = detail::exception;
/// @copydoc detail::parse_error
using parse_error = detail::parse_error;
/// @copydoc detail::invalid_iterator
Expand Down
2 changes: 2 additions & 0 deletions src/json.hpp.re2c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1264,6 +1264,8 @@ class basic_json
/// Classes to implement user-defined exceptions.
/// @{

/// @copydoc detail::exception
using exception = detail::exception;
/// @copydoc detail::parse_error
using parse_error = detail::parse_error;
/// @copydoc detail::invalid_iterator
Expand Down