Fix the memout issue seen in recent nightly regressions (was due to a

Statistics-printing problem, limited to certain benchmarks).

Mark some unlabeled header files "cvc4_private.h".

Other minor cleanup.

(this commit was certified error- and warning-free by the test-and-commit script.)

1 files changed, 3 insertions, 1 deletions

diff --git a/src/main/driver_unified.cpp b/src/main/driver_unified.cpp
index e2b1c21f0..4ac137ef1 100644
--- a/src/main/driver_unified.cpp
+++ b/src/main/driver_unified.cpp
@@ -308,9 +308,11 @@ int runCvc4(int argc, char* argv[], Options& opts) {
 
   s_totalTime.stop();
 
+  // Set the global executor pointer to NULL first.  If we get a
+  // signal while dumping statistics, we don't want to try again.
+  pExecutor = NULL;
   if(opts[options::statistics]) {
     cmdExecutor.flushStatistics(*opts[options::err]);
   }
-  pExecutor = NULL;
   return returnValue;
 }