More work on moving engine into dlmalloc heap

luprex/core/cpp/world.hpp

@@ -3,11 +3,12 @@
 #define WORLD_HPP
 
 #include "wrap-set.hpp"
-#include "wrap-utility.hpp"
-#include "wrap-memory.hpp"
 #include "wrap-unordered-map.hpp"
 #include "wrap-map.hpp"
 
+#include <memory>
+#include <utility>
+
 #include "luastack.hpp"
 #include "planemap.hpp"
 #include "idalloc.hpp"
@@ -87,7 +88,7 @@ public:
     void configure_id_pool_for_actor() { id_player_pool_.set_fifo_capacity(3); id_player_pool_.refill(); }
 };
 
-using UniqueTangible = eng::unique_ptr<Tangible>;
+using UniqueTangible = std::unique_ptr<Tangible>;
 
 class World {
 public:
@@ -247,7 +248,7 @@ public:
     void open_lthread_state(int64_t actor_id, int64_t place_id, bool ppool, bool prints);
     void close_lthread_state();
 
-    eng::ostream *lthread_print_stream() const;
+    std::ostream *lthread_print_stream() const;
 
     // Allocate a single ID.
     //
@@ -489,7 +490,7 @@ private:
     int64_t lthread_actor_id_;
     int64_t lthread_place_id_;
     int64_t lthread_use_ppool_;
-    eng::unique_ptr<eng::ostringstream> lthread_prints_;
+    std::unique_ptr<eng::ostringstream> lthread_prints_;
 
     friend class Tangible;  
     friend int lfn_tangible_animate(lua_State *L);
@@ -502,7 +503,7 @@ private:
     friend int lfn_tangible_scan(lua_State *L);
 };
 
-using UniqueWorld = eng::unique_ptr<World>;
+using UniqueWorld = std::unique_ptr<World>;
 
 
 #endif // WORLD_HPP