diff options
Diffstat (limited to 'c++/cursesp.h')
| -rw-r--r-- | c++/cursesp.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/c++/cursesp.h b/c++/cursesp.h index 9b63d6d..54b0d58 100644 --- a/c++/cursesp.h +++ b/c++/cursesp.h @@ -1,6 +1,6 @@ // * This makes emacs happy -*-Mode: C++;-*- /**************************************************************************** - * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * + * Copyright (c) 1998-2012,2014 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 * @@ -34,7 +34,7 @@ #ifndef NCURSES_CURSESP_H_incl #define NCURSES_CURSESP_H_incl 1 -// $Id: cursesp.h,v 1.29 2008/08/16 17:20:23 tom Exp $ +// $Id: cursesp.h,v 1.31 2014/08/09 22:06:26 Adam.Jiang Exp $ #include <cursesw.h> @@ -86,7 +86,7 @@ protected: return result; } - void OnError (int err) const THROWS(NCursesPanelException) + void OnError (int err) const THROW2(NCursesException const, NCursesPanelException) { if (err==ERR) THROW(new NCursesPanelException (this, err)); @@ -236,7 +236,8 @@ public: : NCursesPanel (nlines, ncols, begin_y, begin_x) { if (p) - set_user (const_cast<void *>(p_UserData)); + set_user (const_cast<void *>(reinterpret_cast<const void*> + (p_UserData))); }; // This creates an user panel of the requested size with associated // user data pointed to by p_UserData. @@ -244,14 +245,14 @@ public: NCursesUserPanel(const T* p_UserData = STATIC_CAST(T*)(0)) : NCursesPanel() { if (p) - set_user(const_cast<void *>(p_UserData)); + set_user(const_cast<void *>(reinterpret_cast<const void*>(p_UserData))); }; // This creates an user panel associated with the ::stdscr and user data // pointed to by p_UserData. virtual ~NCursesUserPanel() {}; - T* UserData (void) const + T* UserData (void) { return reinterpret_cast<T*>(get_user ()); }; @@ -260,7 +261,7 @@ public: virtual void setUserData (const T* p_UserData) { if (p) - set_user (const_cast<void *>(p_UserData)); + set_user (const_cast<void *>(reinterpret_cast<const void*>(p_UserData))); } // Associate the user panel with the user data pointed to by p_UserData. }; |