diff --git a/include/xo/arena/MemorySizeInfo.hpp b/include/xo/arena/MemorySizeInfo.hpp index 764eae6..37b5ce0 100644 --- a/include/xo/arena/MemorySizeInfo.hpp +++ b/include/xo/arena/MemorySizeInfo.hpp @@ -16,8 +16,10 @@ namespace xo { using size_type = std::size_t; MemorySizeInfo() = default; - MemorySizeInfo(std::string_view name, std::size_t u, std::size_t a, std::size_t c, std::size_t r) - : resource_name_{name}, used_{u}, allocated_{a}, committed_{c}, reserved_{r} + MemorySizeInfo(std::string_view name, + std::size_t u, std::size_t a, std::size_t c, std::size_t r) + : resource_name_{name}, + used_{u}, allocated_{a}, committed_{c}, reserved_{r} {} static MemorySizeInfo sentinel() { return MemorySizeInfo(); } diff --git a/src/arena/DArena.cpp b/src/arena/DArena.cpp index cb305f9..72d8cbf 100644 --- a/src/arena/DArena.cpp +++ b/src/arena/DArena.cpp @@ -67,7 +67,7 @@ namespace xo { DArena::DArena(const ArenaConfig & cfg) { - *this = std::move(map(cfg)); + *this = map(cfg); } DArena::DArena(const ArenaConfig & cfg, @@ -290,7 +290,7 @@ namespace xo { (complete_flag ? alloc_mode::sub_complete : alloc_mode::sub_incomplete), - typeseq::anon() /*typeseq: ignored*/, + typeseq::sentinel() /*typeseq: ignored*/, 0 /*age - ignored */); } diff --git a/utest/DArena.test.cpp b/utest/DArena.test.cpp index e999c35..03e1633 100644 --- a/utest/DArena.test.cpp +++ b/utest/DArena.test.cpp @@ -147,7 +147,7 @@ namespace xo { REQUIRE(arena.allocated() == 0); size_t z0 = 1; - byte * m0 = arena.alloc(typeseq::anon(), 1); + byte * m0 = arena.alloc(typeseq::sentinel(), 1); REQUIRE(m0); REQUIRE(arena.last_error().error_ == error::ok); @@ -159,7 +159,7 @@ namespace xo { REQUIRE(arena.committed() <= arena.reserved()); size_t z1 = 16; - byte * m1 = arena.alloc(typeseq::anon(), z1); + byte * m1 = arena.alloc(typeseq::sentinel(), z1); REQUIRE(m1); REQUIRE(arena.last_error().error_ == error::ok); @@ -195,7 +195,7 @@ namespace xo { REQUIRE(arena.allocated() == 0); size_t z0 = 1; - byte * m0 = arena.alloc(typeseq::anon(), 1); + byte * m0 = arena.alloc(typeseq::sentinel(), 1); REQUIRE(m0);