diff options
Diffstat (limited to 'src/lib/netlist/prg/nltool.cpp')
-rw-r--r-- | src/lib/netlist/prg/nltool.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/lib/netlist/prg/nltool.cpp b/src/lib/netlist/prg/nltool.cpp index f039cf44ac4..a6513f260b9 100644 --- a/src/lib/netlist/prg/nltool.cpp +++ b/src/lib/netlist/prg/nltool.cpp @@ -77,8 +77,8 @@ public: static plib::pstdout pout_strm; static plib::pstderr perr_strm; -static plib::pstream_fmt_writer_t pout(pout_strm); -static plib::pstream_fmt_writer_t perr(perr_strm); +static plib::putf8_fmt_writer pout(pout_strm); +static plib::putf8_fmt_writer perr(perr_strm); static NETLIST_START(dummy) /* Standard stuff */ @@ -244,8 +244,9 @@ static std::vector<input_t> read_input(const netlist::setup_t &setup, pstring fn if (fname != "") { plib::pifilestream f(fname); + plib::putf8_reader r(f); pstring l; - while (f.readline(l)) + while (r.readline(l)) { if (l != "") { @@ -492,7 +493,7 @@ static void listdevices(tool_options_t &opts) -------------------------------------------------*/ #if 0 -static const char *pmf_verbose[] = +static const pstring pmf_verbose[] = { "NL_PMF_TYPE_VIRTUAL", "NL_PMF_TYPE_GNUC_PMF", @@ -585,7 +586,7 @@ int main(int argc, char *argv[]) result = c.result(); } /* present result */ - pout_strm.write(result); + pout.write(result); } else { |