Add Env class (#6093)

This class contains all globally available utilities for internal code.

1 files changed, 7 insertions, 8 deletions

diff --git a/src/smt/smt_engine_state.cpp b/src/smt/smt_engine_state.cpp
index 1da33cde4..504709942 100644
--- a/src/smt/smt_engine_state.cpp
+++ b/src/smt/smt_engine_state.cpp
@@ -20,10 +20,12 @@
 namespace CVC4 {
 namespace smt {
 
-SmtEngineState::SmtEngineState(SmtEngine& smt)
+SmtEngineState::SmtEngineState(context::Context* c,
+                               context::UserContext* u,
+                               SmtEngine& smt)
     : d_smt(smt),
-      d_context(new context::Context()),
-      d_userContext(new context::UserContext()),
+      d_context(c),
+      d_userContext(u),
       d_pendingPops(0),
       d_fullyInited(false),
       d_queryMade(false),
@@ -233,12 +235,9 @@ void SmtEngineState::popto(int toLevel)
   d_userContext->popto(toLevel);
 }
 
-context::UserContext* SmtEngineState::getUserContext()
-{
-  return d_userContext.get();
-}
+context::UserContext* SmtEngineState::getUserContext() { return d_userContext; }
 
-context::Context* SmtEngineState::getContext() { return d_context.get(); }
+context::Context* SmtEngineState::getContext() { return d_context; }
 
 Result SmtEngineState::getStatus() const { return d_status; }