diff options
Diffstat (limited to 'src/lib/netlist/tools/nl_convert.h')
-rwxr-xr-x | src/lib/netlist/tools/nl_convert.h | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/src/lib/netlist/tools/nl_convert.h b/src/lib/netlist/tools/nl_convert.h index fec745b5c5e..a62a23b403f 100755 --- a/src/lib/netlist/tools/nl_convert.h +++ b/src/lib/netlist/tools/nl_convert.h @@ -8,6 +8,7 @@ /// \file nl_convert.h /// +#include "plib/palloc.h" #include "plib/pstring.h" #include "plib/ptokenizer.h" #include "plib/ptypes.h" @@ -18,6 +19,14 @@ // convert - convert a spice netlist // ------------------------------------------------- +namespace netlist +{ + +namespace convert +{ + +using arena = plib::aligned_arena; + class nl_convert_base_t { public: @@ -155,7 +164,7 @@ private: pstring m_alias; }; - void add_device(plib::unique_ptr<dev_t> dev); + void add_device(arena::unique_ptr<dev_t> dev); dev_t *get_device(const pstring &name) { for (auto &e : m_devs) @@ -166,10 +175,10 @@ private: std::stringstream m_buf; - std::vector<plib::unique_ptr<dev_t>> m_devs; - std::unordered_map<pstring, plib::unique_ptr<net_t> > m_nets; + std::vector<arena::unique_ptr<dev_t>> m_devs; + std::unordered_map<pstring, arena::unique_ptr<net_t> > m_nets; std::vector<std::pair<pstring, pstring>> m_ext_alias; - std::unordered_map<pstring, plib::unique_ptr<pin_alias_t>> m_pins; + std::unordered_map<pstring, arena::unique_ptr<pin_alias_t>> m_pins; std::vector<unit_t> m_units; pstring m_numberchars; @@ -266,4 +275,7 @@ private: }; +} // namespace convert +} // namespace netlist + #endif // NL_CONVERT_H_ |