diff options
| author | Guillaume Maudoux <guillaume.maudoux@tweag.io> | 2022-09-07 00:34:03 +0200 |
|---|---|---|
| committer | Guillaume Maudoux <guillaume.maudoux@tweag.io> | 2022-09-07 00:34:03 +0200 |
| commit | eb460a9529dd79995b6b788d59322fbc8f989214 (patch) | |
| tree | 2dec54ef6b3096d787cb49cb0f2f6b7041b1f6c1 /src/libexpr/value.hh | |
| parent | 9ff892aad4ee13532ea84cb6e4a2a53d70945efe (diff) | |
| parent | 96001098796c9011d1670cc8a7acd00ef49b2d7a (diff) | |
WIP: broken merge but need a git checkpoint
Diffstat (limited to 'src/libexpr/value.hh')
| -rw-r--r-- | src/libexpr/value.hh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libexpr/value.hh b/src/libexpr/value.hh index 3fa43bc5c..a428bc565 100644 --- a/src/libexpr/value.hh +++ b/src/libexpr/value.hh @@ -99,7 +99,7 @@ class ExternalValueBase /* Print the value as JSON. Defaults to unconvertable, i.e. throws an error */ virtual void printValueAsJSON(EvalState & state, bool strict, - JSONPlaceholder & out, PathSet & context) const; + JSONPlaceholder & out, PathSet & context, bool copyToStore = true) const; /* Print the value as XML. Defaults to unevaluated */ virtual void printValueAsXML(EvalState & state, bool strict, bool location, @@ -404,9 +404,9 @@ public: #if HAVE_BOEHMGC -typedef std::vector<Value *, traceable_allocator<Value *> > ValueVector; -typedef std::map<Symbol, Value *, std::less<Symbol>, traceable_allocator<std::pair<const Symbol, Value *> > > ValueMap; -typedef std::map<Symbol, ValueVector, std::less<Symbol>, traceable_allocator<std::pair<const Symbol, ValueVector> > > ValueVectorMap; +typedef std::vector<Value *, traceable_allocator<Value *>> ValueVector; +typedef std::map<Symbol, Value *, std::less<Symbol>, traceable_allocator<std::pair<const Symbol, Value *>>> ValueMap; +typedef std::map<Symbol, ValueVector, std::less<Symbol>, traceable_allocator<std::pair<const Symbol, ValueVector>>> ValueVectorMap; #else typedef std::vector<Value *> ValueVector; typedef std::map<Symbol, Value *> ValueMap; |