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=98ce10279e4f0d6f60f13558932e4ab3d5fd3625;hpb=850abfde7f0d985ba01526c346bcd0d733562943;p=cln.git

diff --git a/src/base/output/cl_prin_globals.cc b/src/base/output/cl_prin_globals.cc
index 98ce102..fd61467 100644
--- a/src/base/output/cl_prin_globals.cc
+++ b/src/base/output/cl_prin_globals.cc
@@ -3,8 +3,6 @@
 // General includes.
 #include "cl_sysdep.h"
 
-CL_PROVIDE(cl_prin_globals)
-
 // Specification.
 #include "cln/output.h"
 
@@ -13,18 +11,32 @@ CL_PROVIDE(cl_prin_globals)
 
 namespace cln {
 
-cl_ostream stdout = std::cout;
-cl_ostream stderr = std::cerr;
-
 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(default_print_flags)
 {
 	default_print_flags.rational_base = 10;
-	default_print_flags.rational_readably = cl_false;
-	default_print_flags.float_readably = cl_false;
+	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 = cl_false;
+	default_print_flags.complex_readably = false;
 	default_print_flags.vector_syntax = vsyntax_pretty;
 	default_print_flags.univpoly_varname = "x";
 }
@@ -32,4 +44,3 @@ AT_INITIALIZATION(default_print_flags)
 
 }  // namespace cln
 
-CL_PROVIDE_END(cl_prin_globals)