diff options
| author | irfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1997-11-07 03:16:50 +0000 |
|---|---|---|
| committer | irfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1997-11-07 03:16:50 +0000 |
| commit | 06cfc98eedbedb12028c0520095d9d5e9617ba0e (patch) | |
| tree | 363fe7a0ce383d75df15d61b74255adf902596bb | |
| parent | 891adbd6fce978d3313459712e28b41185e8368c (diff) | |
| download | ATCD-06cfc98eedbedb12028c0520095d9d5e9617ba0e.tar.gz | |
*** empty log message ***
| -rw-r--r-- | TAO/ChangeLog-98c | 7 | ||||
| -rw-r--r-- | TAO/tao/connect.i | 6 | ||||
| -rw-r--r-- | ace/Synch_T.h | 12 |
3 files changed, 17 insertions, 8 deletions
diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c index e6376aeefe0..e3b3edd6360 100644 --- a/TAO/ChangeLog-98c +++ b/TAO/ChangeLog-98c @@ -1,3 +1,10 @@ +Thu Nov 06 20:58:52 1997 <irfan@TWOSTEP> + + * tao/connect.cpp: Made sure that TAO_Server_Connection_Handler + and TAO_Client_Connection_Handler have a zero Reactor pointer. + If this is not the case, they will try to deregister from a + sometimes non-existent Reactor. + Thu Nov 6 19:06:59 1997 Sergio Flores <sergio@polka.cs.wustl.edu> * docs/releasenotes/index.html: Updated status of Naming Service diff --git a/TAO/tao/connect.i b/TAO/tao/connect.i index a15063560ea..8815da99c0f 100644 --- a/TAO/tao/connect.i +++ b/TAO/tao/connect.i @@ -11,8 +11,10 @@ TAO_Server_Connection_Handler::params (TAO_OA_Parameters *p) } ACE_INLINE -TAO_Client_Connection_Handler::TAO_Client_Connection_Handler (ACE_Thread_Manager *) -{} +TAO_Client_Connection_Handler::TAO_Client_Connection_Handler (ACE_Thread_Manager *t) + : TAO_SVC_HANDLER (t, 0, 0) +{ +} /* // @@ Chris, shouldn't we protect this stuff with some type of #ifdef diff --git a/ace/Synch_T.h b/ace/Synch_T.h index 0a1f4b2abec..e65af45549d 100644 --- a/ace/Synch_T.h +++ b/ace/Synch_T.h @@ -761,12 +761,6 @@ public: typedef ACE_Null_Mutex NULL_SEMAPHORE; }; -#define ACE_SYNCH ACE_MT_SYNCH - -#else /* ACE_HAS_THREADS */ - -#define ACE_SYNCH ACE_NULL_SYNCH - #endif /* ACE_HAS_THREADS */ #define ACE_SYNCH_MUTEX ACE_SYNCH::MUTEX @@ -814,6 +808,12 @@ public: #define ACE_SYNCH_PROCESS_SEMAPHORE ACE_Process_Semaphore #define ACE_SYNCH_PROCESS_MUTEX ACE_Process_Mutex +#if defined (ACE_HAS_THREADS) +#define ACE_SYNCH ACE_MT_SYNCH +#else /* ACE_HAS_THREADS */ +#define ACE_SYNCH ACE_NULL_SYNCH +#endif /* ACE_HAS_THREADS */ + #if defined (__ACE_INLINE__) #include "ace/Synch_T.i" // On non-Win32 platforms, this code will be inlined |