diff options
| author | irfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1997-07-26 18:46:21 +0000 |
|---|---|---|
| committer | irfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1997-07-26 18:46:21 +0000 |
| commit | b5adfd4ffd24551632be96077fe9f519e10bfff7 (patch) | |
| tree | c0b39d4473db1aaf1cd357b18174bc08d5cc5a2a /ace/CORBA_Handler.cpp | |
| parent | 5f1275d9dae3b389ae185f5f80eacf50578a3bb7 (diff) | |
| download | ATCD-b5adfd4ffd24551632be96077fe9f519e10bfff7.tar.gz | |
*** empty log message ***
Diffstat (limited to 'ace/CORBA_Handler.cpp')
| -rw-r--r-- | ace/CORBA_Handler.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ace/CORBA_Handler.cpp b/ace/CORBA_Handler.cpp index 98af56bd02d..fd6760ea551 100644 --- a/ace/CORBA_Handler.cpp +++ b/ace/CORBA_Handler.cpp @@ -8,7 +8,7 @@ #include "ace/CORBA_Handler.i" #endif /* __ACE_INLINE__ */ -#if defined (ACE_HAS_ORBIX) +#if defined (ACE_HAS_ORBIX) && (ACE_HAS_ORBIX != 0) ACE_ALLOC_HOOK_DEFINE(ACE_ST_CORBA_Handler) ACE_ALLOC_HOOK_DEFINE(ACE_CORBA_Handler) @@ -53,7 +53,7 @@ ACE_CORBA_Handler::~ACE_CORBA_Handler (void) } ACE_CORBA_Handler::ACE_CORBA_Handler (void) - : reactor_ (ACE_Service_Config::reactor ()) + : reactor_ (ACE_Reactor::instance ()) { ACE_TRACE ("ACE_CORBA_Handler::ACE_CORBA_Handler"); } @@ -339,11 +339,11 @@ ACE_CORBA_Handler::activate_service (const char *service_name, return 0; } -#if defined (ACE_HAS_MT_ORBIX) +#if defined (ACE_HAS_MT_ORBIX) && (ACE_HAS_MT_ORBIX != 0) ACE_ALLOC_HOOK_DEFINE(ACE_MT_CORBA_Handler) -#if defined (ACE_MT_SAFE) +#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) // Synchronize output operations. ACE_Thread_Mutex ACE_MT_CORBA_Handler::ace_mt_corba_handler_lock_; #endif /* ACE_MT_SAFE */ @@ -357,7 +357,7 @@ ACE_MT_CORBA_Handler::dump (void) const ACE_DEBUG ((LM_DEBUG, "instance_ = %x", this->instance_)); ACE_DEBUG ((LM_DEBUG, "\nthr_mgr_ = %x", this->thr_mgr_)); this->pipe_.dump (); -#if defined (ACE_MT_SAFE) +#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) // Double-Check lock. ace_mt_corba_handler_lock_.dump (); #endif /* ACE_MT_SAFE */ @@ -413,7 +413,7 @@ ACE_MT_CORBA_Handler::resume (void) ACE_MT_CORBA_Handler::ACE_MT_CORBA_Handler (void) { ACE_TRACE ("ACE_MT_CORBA_Handler::ACE_MT_CORBA_Handler"); - this->thr_mgr (ACE_Service_Config::thr_mgr ()); + this->thr_mgr (ACE_Thread_Manager::instance ()); int result = 0; |