Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nix
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 99b73fb5071d
Choose a base ref
...
head repository: NixOS/nix
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 55bba8e4f517
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Oct 9, 2019

  1. Fix Bison 2.4 warning

    edolstra committed Oct 9, 2019
    Copy the full SHA
    926d3e5 View commit details
  2. Copy the full SHA
    55bba8e View commit details
Showing with 7 additions and 5 deletions.
  1. +1 −1 src/libexpr/parser.y
  2. +5 −0 src/libutil/json.cc
  3. +1 −4 src/libutil/json.hh
2 changes: 1 addition & 1 deletion src/libexpr/parser.y
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
%glr-parser
%pure-parser
%define api.pure
%locations
%define parse.error verbose
%defines
5 changes: 5 additions & 0 deletions src/libutil/json.cc
Original file line number Diff line number Diff line change
@@ -171,4 +171,9 @@ JSONObject JSONPlaceholder::object()
return JSONObject(state);
}

JSONPlaceholder::~JSONPlaceholder()
{
assert(!first || std::uncaught_exception());
}

}
5 changes: 1 addition & 4 deletions src/libutil/json.hh
Original file line number Diff line number Diff line change
@@ -168,10 +168,7 @@ public:
{
}

~JSONPlaceholder()
{
assert(!first || std::uncaught_exception());
}
~JSONPlaceholder();

template<typename T>
void write(const T & v)