summaryrefslogtreecommitdiffstats
path: root/src/lib/netlist/plib/pstream.h
diff options
context:
space:
mode:
author Gaston90 <Gastonelias90@gmail.com>2019-02-22 11:09:58 -0300
committer Gaston90 <Gastonelias90@gmail.com>2019-02-22 11:09:58 -0300
commit3972e74ee9e4095b6b151894e77e6bdfb449626c (patch)
tree993529a9c291501ed4d2c4733424c8b5c6373370 /src/lib/netlist/plib/pstream.h
parentb58f948528ffc9899b71481e813f04a3049ea1bf (diff)
parent9ec1ab5d1aa23610e7cff20fad5f05cfbe1aa052 (diff)
Merge branch 'master' of https://github.com/Robbbert/hbmame
Diffstat (limited to 'src/lib/netlist/plib/pstream.h')
-rw-r--r--src/lib/netlist/plib/pstream.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/netlist/plib/pstream.h b/src/lib/netlist/plib/pstream.h
index 80619137c51..d5b2bfa4809 100644
--- a/src/lib/netlist/plib/pstream.h
+++ b/src/lib/netlist/plib/pstream.h
@@ -447,7 +447,7 @@ private:
template <typename T>
struct constructor_helper
{
- std::unique_ptr<pistream> operator()(T &&s) { return std::move(plib::make_unique<T>(std::move(s))); }
+ plib::unique_ptr<pistream> operator()(T &&s) { return std::move(plib::make_unique<T>(std::move(s))); }
};
// NOLINTNEXTLINE(cppcoreguidelines-special-member-functions)
@@ -489,20 +489,20 @@ public:
}
private:
- std::unique_ptr<pistream> m_strm;
+ plib::unique_ptr<pistream> m_strm;
putf8string m_linebuf;
};
template <>
struct constructor_helper<putf8_reader>
{
- std::unique_ptr<pistream> operator()(putf8_reader &&s) { return std::move(s.m_strm); }
+ plib::unique_ptr<pistream> operator()(putf8_reader &&s) { return std::move(s.m_strm); }
};
template <>
-struct constructor_helper<std::unique_ptr<pistream>>
+struct constructor_helper<plib::unique_ptr<pistream>>
{
- std::unique_ptr<pistream> operator()(std::unique_ptr<pistream> &&s) { return std::move(s); }
+ plib::unique_ptr<pistream> operator()(plib::unique_ptr<pistream> &&s) { return std::move(s); }
};
@@ -626,11 +626,11 @@ public:
{
std::size_t sz = 0;
read(sz);
- auto buf = plib::palloc_array<plib::string_info<pstring>::mem_t>(sz+1);
+ auto buf = plib::pnew_array<plib::string_info<pstring>::mem_t>(sz+1);
m_strm.read(reinterpret_cast<pistream::value_type *>(buf), sz);
buf[sz] = 0;
s = pstring(buf);
- plib::pfree_array(buf);
+ plib::pdelete_array(buf);
}
template <typename T>