X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=c%2B%2B%2Fcursesmain.cc;h=cc41b50be0bdc27c45db723e933e8fc2c5536de3;hp=1f82d4ad84cedbcae2e4c109a5dc587dfae5f31a;hb=HEAD;hpb=2639531af0c3ca25b48e7bcb9c790fa566cc5892 diff --git a/c++/cursesmain.cc b/c++/cursesmain.cc index 1f82d4ad..cc41b50b 100644 --- a/c++/cursesmain.cc +++ b/c++/cursesmain.cc @@ -1,6 +1,7 @@ // * this is for making emacs happy: -*-Mode: C++;-*- /**************************************************************************** - * Copyright (c) 1998-2003,2007 Free Software Foundation, Inc. * + * Copyright 2019,2020 Thomas E. Dickey * + * Copyright 1998-2007,2013 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -35,13 +36,15 @@ #include "cursesapp.h" #if CPP_HAS_TRY_CATCH && HAVE_IOSTREAM +#pragma GCC diagnostic ignored "-Weffc++" #include +#pragma GCC diagnostic warning "-Weffc++" #else #undef CPP_HAS_TRY_CATCH #define CPP_HAS_TRY_CATCH 0 #endif -MODULE_ID("$Id: cursesmain.cc,v 1.14 2007/04/07 17:10:11 tom Exp $") +MODULE_ID("$Id: cursesmain.cc,v 1.20 2020/07/18 19:57:11 anonymous.maarten Exp $") #if HAVE_LOCALE_H #include @@ -57,7 +60,7 @@ MODULE_ID("$Id: cursesmain.cc,v 1.14 2007/04/07 17:10:11 tom Exp $") * You only have to instantiate a static NCursesApplication object in your * main application source file and link this module with your application. */ -int main(int argc, char* argv[]) +int NCURSES_CXX_MAIN_NAME(int argc, char* argv[]) { setlocale(LC_ALL, ""); @@ -85,7 +88,7 @@ int main(int argc, char* argv[]) #endif #if NO_LEAKS delete A; - _nc_free_and_exit(res); + exit_curses(res); #else return(res); #endif