diff options
author | 2017-01-18 00:32:12 +0100 | |
---|---|---|
committer | 2017-01-20 22:20:36 +0100 | |
commit | 1ae3e29ea3fd90e5df31d52c5d3860fde7f3cbac (patch) | |
tree | e32ddf77ae8408a1aea8d7abb15f5048bba3ed81 /src/lib/netlist/nl_setup.cpp | |
parent | d0b6742563ac7f9ed626a89ebd022d09c64dfa4d (diff) |
Assume string literals are UTF8 in netlist code.
At the same time, any char pointer has to be explicitly converted to
pstring by specifying an encoding. Not yet optimal, but certainly better
than what was there before.
Removed unneeded methods from pstring. (nw)
Diffstat (limited to 'src/lib/netlist/nl_setup.cpp')
-rw-r--r-- | src/lib/netlist/nl_setup.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/lib/netlist/nl_setup.cpp b/src/lib/netlist/nl_setup.cpp index adefdf96452..382ee545500 100644 --- a/src/lib/netlist/nl_setup.cpp +++ b/src/lib/netlist/nl_setup.cpp @@ -140,17 +140,17 @@ pstring setup_t::objtype_as_str(detail::device_object_t &in) const switch (in.type()) { case terminal_t::TERMINAL: - return "TERMINAL"; + return pstring("TERMINAL"); case terminal_t::INPUT: - return "INPUT"; + return pstring("INPUT"); case terminal_t::OUTPUT: - return "OUTPUT"; + return pstring("OUTPUT"); case terminal_t::PARAM: - return "PARAM"; + return pstring("PARAM"); } // FIXME: noreturn log().fatal(MF_1_UNKNOWN_OBJECT_TYPE_1, static_cast<unsigned>(in.type())); - return "Error"; + return pstring("Error"); } pstring setup_t::get_initial_param_val(const pstring name, const pstring def) @@ -526,7 +526,8 @@ void setup_t::connect_terminal_input(terminal_t &term, detail::core_terminal_t & } else if (inp.is_logic()) { - log().verbose("connect terminal {1} (in, {2}) to {3}\n", inp.name(), pstring(inp.is_analog() ? "analog" : inp.is_logic() ? "logic" : "?"), term.name()); + log().verbose("connect terminal {1} (in, {2}) to {3}\n", inp.name(), + inp.is_analog() ? pstring("analog") : inp.is_logic() ? pstring("logic") : pstring("?"), term.name()); auto proxy = get_a_d_proxy(inp); //out.net().register_con(proxy->proxy_term()); |