X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=c%2B%2B%2Fetip.h.in;h=ce05d75bd98dc5bd4a8a8d7402098453fac8405c;hp=3ce19e8e0f3732e29be1794635877b57e63b102a;hb=HEAD;hpb=a5fe3726f7d4374e9b1551b535c8617b423996f2 diff --git a/c++/etip.h.in b/c++/etip.h.in index 3ce19e8e..70842ef6 100644 --- a/c++/etip.h.in +++ b/c++/etip.h.in @@ -1,6 +1,6 @@ // * This makes emacs happy -*-Mode: C++;-*- /**************************************************************************** - * Copyright 2018-2020,2021 Thomas E. Dickey * + * 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 * @@ -32,7 +32,7 @@ * Author: Juergen Pfeifer, 1997 * ****************************************************************************/ -// $Id: etip.h.in,v 1.46 2021/04/17 17:59:57 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 @@ -70,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 @@ -127,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 @@ -139,6 +149,10 @@ extern "C" { #define STATIC_CAST(s) (s) #endif +#ifndef NCURSES_CXX_IMPEXP +#define NCURSES_CXX_IMPEXP /* nothing */ +#endif + // Forward Declarations class NCURSES_CXX_IMPEXP NCursesPanel; class NCURSES_CXX_IMPEXP NCursesMenu; @@ -221,7 +235,7 @@ public: { } - virtual const char *classname() const { + virtual const char *classname() const NCURSES_OVERRIDE { return "NCursesPanel"; } @@ -272,7 +286,7 @@ public: { } - virtual const char *classname() const { + virtual const char *classname() const NCURSES_OVERRIDE { return "NCursesMenu"; } @@ -323,7 +337,7 @@ public: { } - virtual const char *classname() const { + virtual const char *classname() const NCURSES_OVERRIDE { return "NCursesForm"; }