summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib/netlist/plib/pmain.cpp
diff options
context:
space:
mode:
author andreasnaive <andreasnaive@gmail.com>2019-03-25 23:13:40 +0100
committer andreasnaive <andreasnaive@gmail.com>2019-03-25 23:13:40 +0100
commitb380514764cf857469bae61c11143a19f79a74c5 (patch)
tree63c8012e262618f08a332da31dd714281aa2c5ed /src/lib/netlist/plib/pmain.cpp
parentc24473ddff715ecec2e258a6eb38960cf8c8e98e (diff)
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/lib/netlist/plib/pmain.cpp')
-rw-r--r--src/lib/netlist/plib/pmain.cpp13
1 files changed, 9 insertions, 4 deletions
diff --git a/src/lib/netlist/plib/pmain.cpp b/src/lib/netlist/plib/pmain.cpp
index b381d96dca7..93c4076bac2 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);
+ auto ret = pstring(buf, pstring::UTF8);
delete [] buf;
return ret;
}
@@ -37,13 +37,18 @@ namespace plib {
: options()
, pout_strm()
, perr_strm()
- , pout(&pout_strm)
- , perr(&perr_strm)
+ , pout(pout_strm)
+ , perr(perr_strm)
{
}
- int app::main_utfX(int argc, char **argv)
+ app::~app()
+ {
+
+ }
+
+ int app::main_utfX(int argc, char *argv[])
{
auto r = this->parse(argc, argv);
int ret = 0;