From b380514764cf857469bae61c11143a19f79a74c5 Mon Sep 17 00:00:00 2001 From: andreasnaive Date: Mon, 25 Mar 2019 23:13:40 +0100 Subject: Revert "conflict resolution (nw)" This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing changes made to 009cba4fb8102102168ef32870892438327f3705. --- src/lib/netlist/plib/pmain.h | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) (limited to 'src/lib/netlist/plib/pmain.h') diff --git a/src/lib/netlist/plib/pmain.h b/src/lib/netlist/plib/pmain.h index 4f4be779251..e2f84b90de6 100644 --- a/src/lib/netlist/plib/pmain.h +++ b/src/lib/netlist/plib/pmain.h @@ -10,21 +10,20 @@ #ifndef PMAIN_H_ #define PMAIN_H_ -#include "palloc.h" #include "poptions.h" -#include "pstream.h" #include "pstring.h" #include "putil.h" +#include "pstream.h" -#include #include +#include #ifdef _WIN32 #define PMAIN(appclass) \ extern "C" int wmain(int argc, wchar_t *argv[]) { return plib::app::mainrun(argc, argv); } #else #define PMAIN(appclass) \ -int main(int argc, char **argv) { return plib::app::mainrun(argc, argv); } +int main(int argc, char *argv[]) { return plib::app::mainrun(argc, argv); } #endif @@ -37,10 +36,7 @@ namespace plib { { public: app(); - - COPYASSIGNMOVE(app, delete) - - virtual ~app() = default; + virtual ~app(); virtual pstring usage() = 0; virtual int execute() = 0; @@ -52,21 +48,21 @@ namespace plib { plib::putf8_fmt_writer perr; template - static int mainrun(int argc, T **argv) + static int mainrun(int argc, T *argv[]) { - auto a = plib::make_unique(); + auto a = std::unique_ptr(new C); return a->main_utfX(argc, argv); } private: - int main_utfX(int argc, char **argv); + int main_utfX(int argc, char *argv[]); #ifdef _WIN32 int main_utfX(int argc, wchar_t *argv[]); #endif }; -} // namespace plib +} -- cgit v1.2.3-70-g09d2