More work on moving engine into dlmalloc heap

luprex/core/cpp/printbuffer.hpp

@@ -79,18 +79,17 @@
 
 #include "wrap-deque.hpp"
 #include "wrap-string.hpp"
-#include "wrap-memory.hpp"
-#include "wrap-ostream.hpp"
-
+#include <ostream>
 #include "streambuffer.hpp"
 #include "util.hpp"
 #include "invocation.hpp"
 #include "debugcollector.hpp"
 
+#include <memory>
 
 struct PrintBufferCore;
 
-class PrintBuffer {
+class PrintBuffer : public eng::heap {
 private:
     PrintBufferCore *core_;
 
@@ -139,7 +138,7 @@ public:
 };
 
 
-class PrintChanneler {
+class PrintChanneler : public eng::heap {
 private:
     int64_t line_;
 public:
@@ -151,7 +150,7 @@ public:
     // Copy any new lines from the printbuffer to the stdostream.
     // Update the current line number.  Return true if the printbuffer
     // contains any lines that have already been channeled.
-    bool channel(const PrintBuffer *pb, eng::ostream &ostream);
+    bool channel(const PrintBuffer *pb, std::ostream &ostream);
 
     // Generate an invocation that removes unnecessary lines from the
     // printbuffer.