More work on moving engine into dlmalloc heap

luprex/core/cpp/streambuffer.hpp

@@ -214,14 +214,14 @@
 
 #include "wrap-string.hpp"
 #include "wrap-sstream.hpp"
-#include "wrap-utility.hpp"
+
+#include <utility>
+#include <cstdint>
+#include <cassert>
 
 #include "luastack.hpp"
 #include "util.hpp"
 
-#include <cstdint>
-#include <cassert>
-
 class StreamException
 {
 public:
@@ -404,7 +404,7 @@ public:
     void *lua_reader_ud(int64_t bytes);
 
     // Get an ostream that writes into the StreamBuffer.
-    eng::ostream &ostream();
+    std::ostream &ostream();
 
 private:
     // Start and end of the allocated block.
@@ -429,7 +429,7 @@ private:
     int64_t lua_reader_size_;
 
     // The ostream.  Only allocated on demand.
-    eng::unique_ptr<eng::ostream> ostream_;
+    std::unique_ptr<std::ostream> ostream_;
 
     // Initialize with a new buffer.
     void init(bool fixed, bool owned, char *buf, int64_t size);