[build] Move CLN version info into the include/cln/version.h file...

[cln.git] / src / base / cl_debug.cc

diff --git a/src/base/cl_debug.cc b/src/base/cl_debug.cc
index 373c494bf059a30d3fa0665fd1d6238b37d85cc7..9c284983987e8fca6584613c52c692afb8615238 100644 (file)
--- a/src/base/cl_debug.cc
+++ b/src/base/cl_debug.cc
@@ -1,33 +1,34 @@
 // Debugging support for dynamic typing.
 
 // General includes.
-#include "cl_sysdep.h"
+#include "base/cl_sysdep.h"
 
 // Specification.
-#include "cl_object.h"
+#include "cln/object.h"
 
 
 // Implementation.
 
-#include "cl_io.h"
-#include "cl_abort.h"
+#include "cln/io.h"
+
+namespace cln {
 
 // The default printer function.
 void cl_dprint_unknown (cl_heap* pointer)
 {
        fprint(cl_debugout, "<unknown @0x");
-       fprinthexadecimal(cl_debugout, (unsigned long) pointer);
+       fprinthexadecimal(cl_debugout, (uintptr_t) pointer);
        fprint(cl_debugout, " refcount=");
        fprintdecimal(cl_debugout, pointer->refcount);
        fprint(cl_debugout, " type=");
-       fprinthexadecimal(cl_debugout, (unsigned long) pointer->type);
+       fprinthexadecimal(cl_debugout, (uintptr_t) pointer->type);
        fprint(cl_debugout, ">");
 }
 
 static void cl_dprint_unknown_immediate (cl_heap* pointer)
 {
        fprint(cl_debugout, "<unknown @0x");
-       fprinthexadecimal(cl_debugout, (unsigned long) pointer);
+       fprinthexadecimal(cl_debugout, (uintptr_t) pointer);
        fprint(cl_debugout, ">");
 }
 
@@ -49,11 +50,7 @@ void* cl_print (cl_uint word)
                else
                        cl_dprint_unknown_immediate(pointer);
        }
-       #ifdef CL_IO_IOSTREAM
-       cl_debugout << endl; // newline and flush output
-       #else
-       fprint(cl_debugout, "\n");
-       #endif
+       cl_debugout << std::endl; // newline and flush output
        return pointer;
 }
 
@@ -76,3 +73,5 @@ void cl_rcpointer::debug_print () const
 {
        cl_print(word);
 }
+
+}  // namespace cln