More work on moving engine into dlmalloc heap

luprex/core/cpp/lpxserver.cpp

@@ -1,21 +1,21 @@
-#include "wrap-memory.hpp"
 #include "wrap-string.hpp"
 #include "wrap-vector.hpp"
 
-#include "lpxserver.hpp"
 #include "world.hpp"
 #include "drivenengine.hpp"
 #include "luaconsole.hpp"
 #include "util.hpp"
 #include "printbuffer.hpp"
 
-class Client {
+#include <memory>
+
+class Client : public eng::heap {
 public:
     int64_t actor_id_;
     SharedChannel channel_;
     UniqueWorld sync_;
 };
-using UniqueClient = eng::unique_ptr<Client>;
+using UniqueClient = std::unique_ptr<Client>;
 using ClientVector = eng::vector<UniqueClient>;
 
 class LpxServer : public DrivenEngine {
@@ -179,7 +179,5 @@ public:
     }
 };
 
-UniqueDrivenEngine make_LpxServer() {
-    return UniqueDrivenEngine(new LpxServer);
-}
+DrivenEngineDefine("lpxserver", LpxServer);