diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2020-06-19 14:59:05 +0000 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2020-06-19 14:59:05 +0000 |
| commit | 01dc8b0bab913718c89062c6514c3e8bfdbf8853 (patch) | |
| tree | d5727524a552c6d5e1caae9e7dadf73fdbc5686a /src/libutil/json.cc | |
| parent | 145d88cb2a160871968285fb1898732090f4e14c (diff) | |
| parent | 2886c92aefc3b38b8b39e212268f286b5caff4e4 (diff) | |
Merge remote-tracking branch 'upstream/master' into no-stringly-typed-derivation-output
Diffstat (limited to 'src/libutil/json.cc')
| -rw-r--r-- | src/libutil/json.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libutil/json.cc b/src/libutil/json.cc index 74e37b4c4..01331947e 100644 --- a/src/libutil/json.cc +++ b/src/libutil/json.cc @@ -173,7 +173,7 @@ JSONObject JSONPlaceholder::object() JSONPlaceholder::~JSONPlaceholder() { - assert(!first || std::uncaught_exception()); + assert(!first || std::uncaught_exceptions()); } } |