summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib/netlist/plib/pmain.cpp
diff options
context:
space:
mode:
author andreasnaive <andreasnaive@gmail.com>2019-03-25 22:44:58 +0100
committer andreasnaive <andreasnaive@gmail.com>2019-03-25 22:44:58 +0100
commitc24473ddff715ecec2e258a6eb38960cf8c8e98e (patch)
tree8ea44b6396a6129913c0aac13859b5de9965e972 /src/lib/netlist/plib/pmain.cpp
parent009cba4fb8102102168ef32870892438327f3705 (diff)
parent598cd5227223c3b04ca31f0dbc1981256d9ea3ff (diff)
conflict resolution (nw)
Diffstat (limited to 'src/lib/netlist/plib/pmain.cpp')
-rw-r--r--src/lib/netlist/plib/pmain.cpp13
1 files changed, 4 insertions, 9 deletions
diff --git a/src/lib/netlist/plib/pmain.cpp b/src/lib/netlist/plib/pmain.cpp
index 93c4076bac2..b381d96dca7 100644
--- a/src/lib/netlist/plib/pmain.cpp
+++ b/src/lib/netlist/plib/pmain.cpp
@@ -23,7 +23,7 @@ namespace plib {
char *buf = new char[dst_char_count + 1];
WideCharToMultiByte(CP_UTF8, 0, w, wlen, buf, dst_char_count, nullptr, nullptr);
buf[dst_char_count] = 0;
- auto ret = pstring(buf, pstring::UTF8);
+ auto ret = pstring(buf);
delete [] buf;
return ret;
}
@@ -37,18 +37,13 @@ namespace plib {
: options()
, pout_strm()
, perr_strm()
- , pout(pout_strm)
- , perr(perr_strm)
+ , pout(&pout_strm)
+ , perr(&perr_strm)
{
}
- app::~app()
- {
-
- }
-
- int app::main_utfX(int argc, char *argv[])
+ int app::main_utfX(int argc, char **argv)
{
auto r = this->parse(argc, argv);
int ret = 0;