bump library version, since CLN doesn't export global object ctors any more.

[cln.git] / src / base / output / cl_prin_globals.cc

diff --git a/src/base/output/cl_prin_globals.cc b/src/base/output/cl_prin_globals.cc
index 98ce10279e4f0d6f60f13558932e4ab3d5fd3625..fd61467303570f0884e56af3bd298ab3335cd2fc 100644 (file)
--- 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)