X-Git-Url: https://ginac.de/CLN/cln.git//cln.git?a=blobdiff_plain;f=src%2Fbase%2Foutput%2Fcl_prin_globals.cc;h=fd61467303570f0884e56af3bd298ab3335cd2fc;hb=478f9e32c706f314e23cc20640f8650ce5631fe5;hp=8a2514875ab3486fd0f71f96271ad25bd82436f1;hpb=dd9e0f894eec7e2a8cf85078330ddc0a6639090b;p=cln.git

diff --git a/src/base/output/cl_prin_globals.cc b/src/base/output/cl_prin_globals.cc
index 8a25148..fd61467 100644
--- a/src/base/output/cl_prin_globals.cc
+++ b/src/base/output/cl_prin_globals.cc
@@ -3,26 +3,44 @@
 // General includes.
 #include "cl_sysdep.h"
 
-CL_PROVIDE(cl_prin_globals)
-
 // Specification.
-#include "cl_output.h"
+#include "cln/output.h"
 
 
 // Implementation.
 
-cl_print_flags cl_default_print_flags;
+namespace cln {
+
+cl_print_flags default_print_flags;
+
+int cl_prin_globals_init_helper::count = 0;
+
+cl_prin_globals_init_helper::cl_prin_globals_init_helper()
+{
+	if (count++ == 0)
+		new ((void *)&default_print_flags) cl_print_flags();
+}
+
+cl_prin_globals_init_helper::~cl_prin_globals_init_helper()
+{
+	if (--count == 0) {
+		// Nothing to clean up.
+	}
+}
+
+
 #if 0 // The default constructors already do this.
-AT_INITIALIZATION(cl_default_print_flags)
+AT_INITIALIZATION(default_print_flags)
 {
-	cl_default_print_flags.rational_base = 10;
-	cl_default_print_flags.rational_readably = cl_false;
-	cl_default_print_flags.float_readably = cl_false;
-	cl_default_print_flags.default_float_format = cl_float_format_ffloat;
-	cl_default_print_flags.complex_readably = cl_false;
-	cl_default_print_flags.vector_syntax = vsyntax_pretty;
-	cl_default_print_flags.univpoly_varname = "x";
+	default_print_flags.rational_base = 10;
+	default_print_flags.rational_readably = false;
+	default_print_flags.float_readably = false;
+	default_print_flags.default_float_format = float_format_ffloat;
+	default_print_flags.complex_readably = false;
+	default_print_flags.vector_syntax = vsyntax_pretty;
+	default_print_flags.univpoly_varname = "x";
 }
 #endif
 
-CL_PROVIDE_END(cl_prin_globals)
+}  // namespace cln
+