From 6ac8200ff5d21d7c4464b4b3a2d3716fa4b942fd Mon Sep 17 00:00:00 2001
From: Ben Burdette <bburdette@protonmail.com>
Date: Mon, 11 Jul 2022 10:21:40 -0600
Subject: [PATCH] use util.hh class instead of local

---
 src/libexpr/primops.cc | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc
index ecc1c136a..3a07e43a7 100644
--- a/src/libexpr/primops.cc
+++ b/src/libexpr/primops.cc
@@ -846,15 +846,6 @@ static RegisterPrimOp primop_floor({
     .fun = prim_floor,
 });
 
-class Counter
-{
-    private:
-        int &counter;
-    public:
-        Counter(int &counter) :counter(counter) { counter++; }
-        ~Counter() { counter--; }
-};
-
 /* Try evaluating the argument. Success => {success=true; value=something;},
  * else => {success=false; value=false;} */
 static void prim_tryEval(EvalState & state, const PosIdx pos, Value * * args, Value & v)
@@ -862,7 +853,7 @@ static void prim_tryEval(EvalState & state, const PosIdx pos, Value * * args, Va
     auto attrs = state.buildBindings(2);
 
     /* increment state.trylevel, and decrement it when this function returns. */
-    Counter trylevel(state.trylevel);
+    MaintainCount trylevel(state.trylevel);
 
     void (* savedDebugRepl)(ref<EvalState> es, const ValMap & extraEnv) = nullptr;
     if (state.debugRepl && state.ignoreTry)