Merge pull request #1438 from jwillemsen/jwi-ACE_HAS_TANDEM_SIGNALS

Removed checks for ACE_HAS_TANDEM_SIGNALS and ACE_TANDEM_T1248_PTHREADS

7 files changed, 13 insertions, 45 deletions

diff --git a/ACE/NEWS b/ACE/NEWS
index 1c465151aa7..aface7a17ea 100644
--- a/ACE/NEWS
+++ b/ACE/NEWS
@@ -1,6 +1,12 @@
 USER VISIBLE CHANGES BETWEEN ACE-7.0.0 and ACE-7.0.1
 ====================================================
 
+. Cleanup of ACE_* macros which are not used anymore
+
+. Removed support for LynxOS 4 which has gcc3
+
+. Make sure C++11 is enabled on MacOSX
+
 USER VISIBLE CHANGES BETWEEN ACE-6.5.12 and ACE-7.0.0
 =====================================================
 
diff --git a/ACE/ace/OS_NS_signal.inl b/ACE/ace/OS_NS_signal.inl
index b9b3616d84f..1f74021742d 100644
--- a/ACE/ace/OS_NS_signal.inl
+++ b/ACE/ace/OS_NS_signal.inl
@@ -201,11 +201,7 @@ signal (int signum, ACE_SignalHandler func)
   else
 #if (defined ACE_WIN32 && !defined ACE_HAS_WINCE) || \
     (!defined ACE_LACKS_UNIX_SIGNALS && !defined ACE_LACKS_SIGNAL)
-#  if !defined (ACE_HAS_TANDEM_SIGNALS)
     return ::signal (signum, func);
-#  else
-    return (ACE_SignalHandler) ::signal (signum, (void (*)(int)) func);
-#  endif /* !ACE_HAS_TANDEM_SIGNALS */
 #else
     // @@ WINCE: Don't know how to implement signal on WinCE (yet.)
     ACE_UNUSED_ARG (signum);
diff --git a/ACE/ace/Signal.cpp b/ACE/ace/Signal.cpp
index 2c285661a0b..0867edbe20e 100644
--- a/ACE/ace/Signal.cpp
+++ b/ACE/ace/Signal.cpp
@@ -102,11 +102,7 @@ ACE_Sig_Action::ACE_Sig_Action (ACE_SignalHandler sig_handler,
   else
     this->sa_.sa_mask = *sig_mask; // Structure assignment...
 
-#if !defined(ACE_HAS_TANDEM_SIGNALS)
   this->sa_.sa_handler = ACE_SignalHandlerV (sig_handler);
-#else
-  this->sa_.sa_handler = (void (*)()) ACE_SignalHandlerV (sig_handler);
-#endif /* !ACE_HAS_TANDEM_SIGNALS */
 }
 
 ACE_Sig_Action::ACE_Sig_Action (ACE_SignalHandler sig_handler,
@@ -118,12 +114,7 @@ ACE_Sig_Action::ACE_Sig_Action (ACE_SignalHandler sig_handler,
 
   // Structure assignment...
   this->sa_.sa_mask = sig_mask.sigset ();
-
-#if !defined(ACE_HAS_TANDEM_SIGNALS)
   this->sa_.sa_handler = ACE_SignalHandlerV (sig_handler);
-#else
-  this->sa_.sa_handler = (void (*)()) ACE_SignalHandlerV (sig_handler);
-#endif /* !ACE_HAS_TANDEM_SIGNALS */
 }
 
 ACE_Sig_Action::ACE_Sig_Action (ACE_SignalHandler sig_handler,
@@ -139,11 +130,7 @@ ACE_Sig_Action::ACE_Sig_Action (ACE_SignalHandler sig_handler,
   else
     this->sa_.sa_mask = *sig_mask; // Structure assignment...
 
-#if !defined(ACE_HAS_TANDEM_SIGNALS)
   this->sa_.sa_handler = ACE_SignalHandlerV (sig_handler);
-#else
-  this->sa_.sa_handler = (void (*)()) ACE_SignalHandlerV (sig_handler);
-#endif /* !ACE_HAS_TANDEM_SIGNALS */
   ACE_OS::sigaction (signum, &this->sa_, 0);
 }
 
@@ -157,12 +144,7 @@ ACE_Sig_Action::ACE_Sig_Action (ACE_SignalHandler sig_handler,
 
   // Structure assignment...
   this->sa_.sa_mask = sig_mask.sigset ();
-
-#if !defined(ACE_HAS_TANDEM_SIGNALS)
   this->sa_.sa_handler = ACE_SignalHandlerV (sig_handler);
-#else
-  this->sa_.sa_handler = (void (*)()) ACE_SignalHandlerV (sig_handler);
-#endif /* !ACE_HAS_TANDEM_SIGNALS */
   ACE_OS::sigaction (signum, &this->sa_, 0);
 }
 
@@ -176,12 +158,7 @@ ACE_Sig_Action::ACE_Sig_Action (const ACE_Sig_Set &signals,
 
   // Structure assignment...
   this->sa_.sa_mask = sig_mask.sigset ();
-
-#if !defined(ACE_HAS_TANDEM_SIGNALS)
   this->sa_.sa_handler = ACE_SignalHandlerV (sig_handler);
-#else
-  this->sa_.sa_handler = (void (*)()) ACE_SignalHandlerV (sig_handler);
-#endif /* !ACE_HAS_TANDEM_SIGNALS */
 
 #if (ACE_NSIG > 0)
   for (int s = 1; s < ACE_NSIG; s++)
@@ -205,11 +182,7 @@ ACE_Sig_Action::ACE_Sig_Action (const ACE_Sig_Set &signals,
   else
     this->sa_.sa_mask = *sig_mask; // Structure assignment...
 
-#if !defined(ACE_HAS_TANDEM_SIGNALS)
   this->sa_.sa_handler = ACE_SignalHandlerV (sig_handler);
-#else
-  this->sa_.sa_handler = (void (*)()) ACE_SignalHandlerV (sig_handler);
-#endif /* !ACE_HAS_TANDEM_SIGNALS */
 
 #if (ACE_NSIG > 0)
   for (int s = 1; s < ACE_NSIG; s++)
diff --git a/ACE/ace/Signal.inl b/ACE/ace/Signal.inl
index 11fb1550967..55882f85b9f 100644
--- a/ACE/ace/Signal.inl
+++ b/ACE/ace/Signal.inl
@@ -140,11 +140,7 @@ ACE_INLINE void
 ACE_Sig_Action::handler (ACE_SignalHandler handler)
 {
   ACE_TRACE ("ACE_Sig_Action::handler");
-#if !defined(ACE_HAS_TANDEM_SIGNALS)
   this->sa_.sa_handler = ACE_SignalHandlerV (handler);
-#else
-  this->sa_.sa_handler = (void (*)()) ACE_SignalHandlerV (handler);
-#endif /* !ACE_HAS_TANDEM_SIGNALS */
 }
 
 ACE_INLINE void
diff --git a/ACE/ace/Task.cpp b/ACE/ace/Task.cpp
index ef7e702c089..4596d91088e 100644
--- a/ACE/ace/Task.cpp
+++ b/ACE/ace/Task.cpp
@@ -14,13 +14,13 @@ ACE_Task_Base::ACE_Task_Base (ACE_Thread_Manager *thr_man)
     thr_mgr_ (thr_man),
     flags_ (0),
     grp_id_ (-1)
-#if !(defined (ACE_TANDEM_T1248_PTHREADS) || defined (ACE_THREAD_T_IS_A_STRUCT))
+#if !defined (ACE_THREAD_T_IS_A_STRUCT)
     ,last_thread_id_ (0)
-#endif /* ! ACE_TANDEM_T1248_PTHREADS || ACE_THREAD_T_IS_A_STRUCT */
+#endif /* !ACE_THREAD_T_IS_A_STRUCT */
 {
-#if defined (ACE_TANDEM_T1248_PTHREADS) || defined (ACE_THREAD_T_IS_A_STRUCT)
+#if defined (ACE_THREAD_T_IS_A_STRUCT)
    ACE_OS::memset( &this->last_thread_id_, '\0', sizeof( this->last_thread_id_ ));
-#endif /* ACE_TANDEM_T1248_PTHREADS || ACE_THREAD_T_IS_A_STRUCT */
+#endif /* ACE_THREAD_T_IS_A_STRUCT */
 }
 
 ACE_Task_Base::~ACE_Task_Base ()
@@ -192,11 +192,11 @@ ACE_Task_Base::activate (long flags,
   if (this->grp_id_ == -1)
     this->grp_id_ = grp_spawned;
 
-#if defined(ACE_TANDEM_T1248_PTHREADS) || defined (ACE_THREAD_T_IS_A_STRUCT)
+#if defined (ACE_THREAD_T_IS_A_STRUCT)
   ACE_OS::memcpy( &this->last_thread_id_, '\0', sizeof(this->last_thread_id_));
 #else
   this->last_thread_id_ = 0;    // Reset to prevent inadvertant match on ID
-#endif /* ACE_TANDEM_T1248_PTHREADS || ACE_THREAD_T_IS_A_STRUCT */
+#endif /* ACE_THREAD_T_IS_A_STRUCT */
 
   return 0;
 
diff --git a/ACE/ace/os_include/os_pthread.h b/ACE/ace/os_include/os_pthread.h
index 5693cb880e2..50c483ba9d7 100644
--- a/ACE/ace/os_include/os_pthread.h
+++ b/ACE/ace/os_include/os_pthread.h
@@ -67,7 +67,7 @@
 // programs to have their own ACE-wide "default".
 
 // PROCESS-level values
-#  if (defined (_POSIX_PRIORITY_SCHEDULING) || defined (ACE_TANDEM_T1248_PTHREADS))
+#  if defined (_POSIX_PRIORITY_SCHEDULING)
 #    define ACE_PROC_PRI_FIFO_MIN  (sched_get_priority_min(SCHED_FIFO))
 #    define ACE_PROC_PRI_RR_MIN    (sched_get_priority_min(SCHED_RR))
 #    if defined (HPUX)
diff --git a/ACE/ace/os_include/os_signal.h b/ACE/ace/os_include/os_signal.h
index 9b5de3b8ce1..32161dfaf70 100644
--- a/ACE/ace/os_include/os_signal.h
+++ b/ACE/ace/os_include/os_signal.h
@@ -153,9 +153,6 @@ extern "C"
   // Prototypes for both signal() and struct sigaction are consistent..
   typedef void (*ACE_SignalHandler)(int);
   typedef void (*ACE_SignalHandlerV)(int);
-#elif defined (ACE_HAS_TANDEM_SIGNALS)
-   typedef void (*ACE_SignalHandler)(...);
-   typedef void (*ACE_SignalHandlerV)(...);
 #elif defined (ACE_HAS_SVR4_SIGNAL_T)
    // SVR4 Signals are inconsistent (e.g., see struct sigaction)..
    typedef void (*ACE_SignalHandler)(int);