X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=c%2B%2B%2Fetip.h.in;h=ce05d75bd98dc5bd4a8a8d7402098453fac8405c;hp=8d5d05e0cca0bdc118b93ddec61fa9e9e35aef3d;hb=HEAD;hpb=2639531af0c3ca25b48e7bcb9c790fa566cc5892 diff --git a/c++/etip.h.in b/c++/etip.h.in index 8d5d05e0..70842ef6 100644 --- a/c++/etip.h.in +++ b/c++/etip.h.in @@ -1,6 +1,7 @@ // * This makes emacs happy -*-Mode: C++;-*- /**************************************************************************** - * Copyright (c) 1998-2005,2007 Free Software Foundation, Inc. * + * Copyright 2018-2021,2022 Thomas E. Dickey * + * Copyright 1998-2012,2017 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 * @@ -31,7 +32,7 @@ * Author: Juergen Pfeifer, 1997 * ****************************************************************************/ -// $Id: etip.h.in,v 1.36 2007/04/07 18:56:32 tom Exp $ +// $Id: etip.h.in,v 1.50 2022/08/20 20:50:00 tom Exp $ #ifndef NCURSES_ETIP_H_incl #define NCURSES_ETIP_H_incl 1 @@ -69,6 +70,10 @@ #define ETIP_NEEDS_MATH_EXCEPTION 0 #endif +#ifndef CPP_HAS_OVERRIDE +#define CPP_HAS_OVERRIDE 0 +#endif + #ifndef CPP_HAS_PARAM_INIT #define CPP_HAS_PARAM_INIT 0 #endif @@ -77,6 +82,10 @@ #define CPP_HAS_STATIC_CAST 0 // workaround for g++ 2.95.3 #endif +#ifndef IOSTREAM_NAMESPACE +#define IOSTREAM_NAMESPACE 0 +#endif + #ifdef __GNUG__ # if ((__GNUG__ <= 2) && (__GNUC_MINOR__ < 8)) # if HAVE_TYPEINFO @@ -109,7 +118,7 @@ # include #endif -#include +#include extern "C" { #if HAVE_VALUES_H @@ -122,6 +131,12 @@ extern "C" { } // Language features +#if CPP_HAS_OVERRIDE +#define NCURSES_OVERRIDE override +#else +#define NCURSES_OVERRIDE /*nothing*/ +#endif + #if CPP_HAS_PARAM_INIT #define NCURSES_PARAM_INIT(value) = value #else @@ -134,12 +149,16 @@ extern "C" { #define STATIC_CAST(s) (s) #endif +#ifndef NCURSES_CXX_IMPEXP +#define NCURSES_CXX_IMPEXP /* nothing */ +#endif + // Forward Declarations -class NCURSES_IMPEXP NCursesPanel; -class NCURSES_IMPEXP NCursesMenu; -class NCURSES_IMPEXP NCursesForm; +class NCURSES_CXX_IMPEXP NCursesPanel; +class NCURSES_CXX_IMPEXP NCursesMenu; +class NCURSES_CXX_IMPEXP NCursesForm; -class NCURSES_IMPEXP NCursesException +class NCURSES_CXX_IMPEXP NCursesException { public: const char *message; @@ -149,12 +168,13 @@ public: : message(msg), errorno (err) {}; - NCursesException (const char* msg) + explicit NCursesException (const char* msg) : message(msg), errorno (E_SYSTEM_ERROR) {}; NCursesException& operator=(const NCursesException& rhs) { + message = rhs.message; errorno = rhs.errorno; return *this; } @@ -173,14 +193,14 @@ public: } }; -class NCURSES_IMPEXP NCursesPanelException : public NCursesException +class NCURSES_CXX_IMPEXP NCursesPanelException : public NCursesException { public: const NCursesPanel* p; NCursesPanelException (const char *msg, int err) : NCursesException (msg, err), - p (NULL) + p (0) {}; NCursesPanelException (const NCursesPanel* panel, @@ -190,9 +210,9 @@ public: p (panel) {}; - NCursesPanelException (int err) : + explicit NCursesPanelException (int err) : NCursesException ("panel library error", err), - p (NULL) + p (0) {}; NCursesPanelException (const NCursesPanel* panel, @@ -215,7 +235,7 @@ public: { } - virtual const char *classname() const { + virtual const char *classname() const NCURSES_OVERRIDE { return "NCursesPanel"; } @@ -224,14 +244,14 @@ public: } }; -class NCURSES_IMPEXP NCursesMenuException : public NCursesException +class NCURSES_CXX_IMPEXP NCursesMenuException : public NCursesException { public: const NCursesMenu* m; NCursesMenuException (const char *msg, int err) : NCursesException (msg, err), - m (NULL) + m (0) {}; NCursesMenuException (const NCursesMenu* menu, @@ -241,9 +261,9 @@ public: m (menu) {}; - NCursesMenuException (int err) : + explicit NCursesMenuException (int err) : NCursesException ("menu library error", err), - m (NULL) + m (0) {}; NCursesMenuException (const NCursesMenu* menu, @@ -266,7 +286,7 @@ public: { } - virtual const char *classname() const { + virtual const char *classname() const NCURSES_OVERRIDE { return "NCursesMenu"; } @@ -275,14 +295,14 @@ public: } }; -class NCURSES_IMPEXP NCursesFormException : public NCursesException +class NCURSES_CXX_IMPEXP NCursesFormException : public NCursesException { public: const NCursesForm* f; NCursesFormException (const char *msg, int err) : NCursesException (msg, err), - f (NULL) + f (0) {}; NCursesFormException (const NCursesForm* form, @@ -292,9 +312,9 @@ public: f (form) {}; - NCursesFormException (int err) : + explicit NCursesFormException (int err) : NCursesException ("form library error", err), - f (NULL) + f (0) {}; NCursesFormException (const NCursesForm* form, @@ -317,7 +337,7 @@ public: { } - virtual const char *classname() const { + virtual const char *classname() const NCURSES_OVERRIDE { return "NCursesForm"; } @@ -326,30 +346,36 @@ public: } }; -#if !((defined(__GNUG__) && defined(__EXCEPTIONS)) || defined(__SUNPRO_CC)) +#if !((defined(__GNUG__) && defined(__EXCEPTIONS) && (__GNUG__ < 7)) || defined(__SUNPRO_CC)) # if HAVE_IOSTREAM # include +# if IOSTREAM_NAMESPACE using std::cerr; using std::endl; +# endif # else # include # endif - extern "C" void exit(int); #endif inline void THROW(const NCursesException *e) { #if defined(__GNUG__) && defined(__EXCEPTIONS) # if ((__GNUG__ <= 2) && (__GNUC_MINOR__ < 8)) (*lib_error_handler)(e ? e->classname() : "", e ? e->message : ""); -#else -#define CPP_HAS_TRY_CATCH 1 -#endif +# elif (__GNUG__ >= 7) + // g++ 7.0 warns about deprecation, but lacks the predefined symbols + ::endwin(); + std::cerr << "Found a problem - goodbye" << std::endl; + exit(EXIT_FAILURE); +# else +# define CPP_HAS_TRY_CATCH 1 +# endif #elif defined(__SUNPRO_CC) # if !defined(__SUNPRO_CC_COMPAT) || (__SUNPRO_CC_COMPAT < 5) genericerror(1, ((e != 0) ? (char *)(e->message) : "")); -#else -#define CPP_HAS_TRY_CATCH 1 -#endif +# else +# define CPP_HAS_TRY_CATCH 1 +# endif #else if (e) cerr << e->message << endl; @@ -361,11 +387,19 @@ inline void THROW(const NCursesException *e) { #define NCURSES_CPP_TRY /* nothing */ #define NCURSES_CPP_CATCH(e) if (false) #define THROWS(s) /* nothing */ +#define THROW2(s,t) /* nothing */ #elif CPP_HAS_TRY_CATCH throw *e; #define NCURSES_CPP_TRY try #define NCURSES_CPP_CATCH(e) catch(e) +#if defined(__cpp_noexcept_function_type) && (__cpp_noexcept_function_type >= 201510) +// C++17 deprecates the usage of throw(). +#define THROWS(s) /* nothing */ +#define THROW2(s,t) /* nothing */ +#else #define THROWS(s) throw(s) +#define THROW2(s,t) throw(s,t) +#endif #endif }