diff options
| author | ocielliottc <elliottc@objectcomputing.com> | 2022-12-15 11:46:19 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-15 11:46:19 -0600 |
| commit | e2191d0ed81004845a123b20519bf0718f4cb689 (patch) | |
| tree | 8be9092f908b91a9eb3f88811ba05b99a4e485b7 | |
| parent | 8022b6898339d0027578c0af19888dc8f2752b9c (diff) | |
| parent | 921366d8fc2a88e7823b68d4a67c1579ee8dc658 (diff) | |
| download | ATCD-e2191d0ed81004845a123b20519bf0718f4cb689.tar.gz | |
Merge pull request #2000 from DOCGroup/elliottc/sighandler-casting
[ace6tao2] Pull changes from ACE 7.
| -rw-r--r-- | ACE/ace/Sig_Adapter.cpp | 3 | ||||
| -rw-r--r-- | ACE/ace/Sig_Handler.cpp | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/ACE/ace/Sig_Adapter.cpp b/ACE/ace/Sig_Adapter.cpp index 18a5cc9b952..97ac519e34d 100644 --- a/ACE/ace/Sig_Adapter.cpp +++ b/ACE/ace/Sig_Adapter.cpp @@ -63,7 +63,8 @@ ACE_Sig_Adapter::handle_signal (int signum, // expecting... this->sa_.register_action (signum, &old_disp); - ACE_Sig_Handler_Ex sig_func = ACE_Sig_Handler_Ex (this->sa_.handler ()); + ACE_SignalHandler sig_handler = this->sa_.handler (); + ACE_Sig_Handler_Ex sig_func = reinterpret_cast<ACE_Sig_Handler_Ex> (reinterpret_cast<void*> (sig_handler)); (*sig_func) (signum, siginfo, ucontext); // Restore the original disposition. diff --git a/ACE/ace/Sig_Handler.cpp b/ACE/ace/Sig_Handler.cpp index e91de0b4fb4..3df12de4da1 100644 --- a/ACE/ace/Sig_Handler.cpp +++ b/ACE/ace/Sig_Handler.cpp @@ -31,9 +31,9 @@ ace_sig_handlers_dispatch (int signum, siginfo_t *info, ucontext_t *context) #define ace_signal_handlers_dispatcher ACE_SignalHandler(ace_sig_handlers_dispatch) #else -#define ace_signal_handler_dispatcher ACE_SignalHandler(ACE_Sig_Handler::dispatch) +#define ace_signal_handler_dispatcher reinterpret_cast<ACE_SignalHandler> (reinterpret_cast<void*> ((ACE_Sig_Handler_Ex)ACE_Sig_Handler::dispatch)) -#define ace_signal_handlers_dispatcher ACE_SignalHandler(ACE_Sig_Handlers::dispatch) +#define ace_signal_handlers_dispatcher reinterpret_cast<ACE_SignalHandler> (reinterpret_cast<void*> ((ACE_Sig_Handler_Ex)ACE_Sig_Handlers::dispatch)) #endif /* ACE_HAS_SIG_C_FUNC */ ACE_BEGIN_VERSIONED_NAMESPACE_DECL |