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, 7 insertions, 5 deletions

diff --git a/src/options/base_options_template.h b/src/options/base_options_template.h
index 97c19930e..c613ff8fd 100644
--- a/src/options/base_options_template.h
+++ b/src/options/base_options_template.h
@@ -16,17 +16,19 @@
  ** Contains code for handling command-line options
  **/
 
+#include "cvc4_public.h"
+
 #ifndef __CVC4__OPTIONS__${module_id}_H
 #define __CVC4__OPTIONS__${module_id}_H
 
 #include "options/options.h"
 ${module_includes}
 
-#line 26 "${template}"
+#line 28 "${template}"
 
 ${module_optionholder_spec}
 
-#line 30 "${template}"
+#line 32 "${template}"
 
 namespace CVC4 {
 
@@ -34,19 +36,19 @@ namespace options {
 
 ${module_decls}
 
-#line 38 "${template}"
+#line 40 "${template}"
 
 }/* CVC4::options namespace */
 
 ${module_specializations}
 
-#line 44 "${template}"
+#line 46 "${template}"
 
 namespace options {
 
 ${module_inlines}
 
-#line 50 "${template}"
+#line 52 "${template}"
 
 }/* CVC4::options namespace */