diff options
author | 2019-03-25 22:44:58 +0100 | |
---|---|---|
committer | 2019-03-25 22:44:58 +0100 | |
commit | c24473ddff715ecec2e258a6eb38960cf8c8e98e (patch) | |
tree | 8ea44b6396a6129913c0aac13859b5de9965e972 /src/lib/netlist/plib/pmain.h | |
parent | 009cba4fb8102102168ef32870892438327f3705 (diff) | |
parent | 598cd5227223c3b04ca31f0dbc1981256d9ea3ff (diff) |
conflict resolution (nw)
Diffstat (limited to 'src/lib/netlist/plib/pmain.h')
-rw-r--r-- | src/lib/netlist/plib/pmain.h | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/src/lib/netlist/plib/pmain.h b/src/lib/netlist/plib/pmain.h index e2f84b90de6..4f4be779251 100644 --- a/src/lib/netlist/plib/pmain.h +++ b/src/lib/netlist/plib/pmain.h @@ -10,20 +10,21 @@ #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 <memory> #include <cwchar> +#include <memory> #ifdef _WIN32 #define PMAIN(appclass) \ extern "C" int wmain(int argc, wchar_t *argv[]) { return plib::app::mainrun<appclass, wchar_t>(argc, argv); } #else #define PMAIN(appclass) \ -int main(int argc, char *argv[]) { return plib::app::mainrun<appclass, char>(argc, argv); } +int main(int argc, char **argv) { return plib::app::mainrun<appclass, char>(argc, argv); } #endif @@ -36,7 +37,10 @@ namespace plib { { public: app(); - virtual ~app(); + + COPYASSIGNMOVE(app, delete) + + virtual ~app() = default; virtual pstring usage() = 0; virtual int execute() = 0; @@ -48,21 +52,21 @@ namespace plib { plib::putf8_fmt_writer perr; template <class C, typename T> - static int mainrun(int argc, T *argv[]) + static int mainrun(int argc, T **argv) { - auto a = std::unique_ptr<C>(new C); + auto a = plib::make_unique<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 |