1 files changed, 13 insertions, 22 deletions
diff --git a/src/theory/arith/error_set.cpp b/src/theory/arith/error_set.cpp
index c397efb9a..b7c35a7fd 100644
--- a/src/theory/arith/error_set.cpp
+++ b/src/theory/arith/error_set.cpp
@@ -128,29 +128,20 @@ void ErrorInformation::setAmount(const DeltaRational& am){
   (*d_amount) = am;
 }
 
-ErrorSet::Statistics::Statistics():
-  d_enqueues("theory::arith::pqueue::enqueues", 0),
-  d_enqueuesCollection("theory::arith::pqueue::enqueuesCollection", 0),
-  d_enqueuesDiffMode("theory::arith::pqueue::enqueuesDiffMode", 0),
-  d_enqueuesVarOrderMode("theory::arith::pqueue::enqueuesVarOrderMode", 0),
-  d_enqueuesCollectionDuplicates("theory::arith::pqueue::enqueuesCollectionDuplicates", 0),
-  d_enqueuesVarOrderModeDuplicates("theory::arith::pqueue::enqueuesVarOrderModeDuplicates", 0)
+ErrorSet::Statistics::Statistics()
+    : d_enqueues(
+        smtStatisticsRegistry().registerInt("theory::arith::pqueue::enqueues")),
+      d_enqueuesCollection(smtStatisticsRegistry().registerInt(
+          "theory::arith::pqueue::enqueuesCollection")),
+      d_enqueuesDiffMode(smtStatisticsRegistry().registerInt(
+          "theory::arith::pqueue::enqueuesDiffMode")),
+      d_enqueuesVarOrderMode(smtStatisticsRegistry().registerInt(
+          "theory::arith::pqueue::enqueuesVarOrderMode")),
+      d_enqueuesCollectionDuplicates(smtStatisticsRegistry().registerInt(
+          "theory::arith::pqueue::enqueuesCollectionDuplicates")),
+      d_enqueuesVarOrderModeDuplicates(smtStatisticsRegistry().registerInt(
+          "theory::arith::pqueue::enqueuesVarOrderModeDuplicates"))
 {
-  smtStatisticsRegistry()->registerStat(&d_enqueues);
-  smtStatisticsRegistry()->registerStat(&d_enqueuesCollection);
-  smtStatisticsRegistry()->registerStat(&d_enqueuesDiffMode);
-  smtStatisticsRegistry()->registerStat(&d_enqueuesVarOrderMode);
-  smtStatisticsRegistry()->registerStat(&d_enqueuesCollectionDuplicates);
-  smtStatisticsRegistry()->registerStat(&d_enqueuesVarOrderModeDuplicates);
-}
-
-ErrorSet::Statistics::~Statistics(){
-  smtStatisticsRegistry()->unregisterStat(&d_enqueues);
-  smtStatisticsRegistry()->unregisterStat(&d_enqueuesCollection);
-  smtStatisticsRegistry()->unregisterStat(&d_enqueuesDiffMode);
-  smtStatisticsRegistry()->unregisterStat(&d_enqueuesVarOrderMode);
-  smtStatisticsRegistry()->unregisterStat(&d_enqueuesCollectionDuplicates);
-  smtStatisticsRegistry()->unregisterStat(&d_enqueuesVarOrderModeDuplicates);
 }
 
 ErrorSet::ErrorSet(ArithVariables& vars,