diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2001-09-24 18:50:31 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2001-09-24 18:50:31 +0000 |
| commit | 7df3b5caa2ffb2997d177ae55e71b0337496556a (patch) | |
| tree | 04f02113f019372b98cdbfaa62613d8ca73cb376 | |
| parent | 04482b503b43251e05979a3be299def26536bb43 (diff) | |
| download | ATCD-7df3b5caa2ffb2997d177ae55e71b0337496556a.tar.gz | |
ChangeLogTag:Mon Sep 24 11:47:34 2001 Ossama Othman <ossama@uci.edu>
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 18 | ||||
| -rw-r--r-- | TAO/tao/ORB.cpp | 9 | ||||
| -rw-r--r-- | TAO/tao/PICurrent.cpp | 1 | ||||
| -rw-r--r-- | TAO/tao/PICurrent_ORBInitializer.h | 5 |
4 files changed, 28 insertions, 5 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 89a59e086dc..593371aaee2 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,21 @@ +Mon Sep 24 11:47:34 2001 Ossama Othman <ossama@uci.edu> + + * tao/ORB.cpp: + + Fixed problem where ORBInitializer variables were not declared + in builds where CORBA messaging was disabled. + + * tao/PICurrent.cpp: + + Include "tao/debug.h" to pull in the declaration of the + TAO_debug_level variable. + + * tao/PICurrent_ORBInitializer.h: + + Moved `LocalObject.h' include outside of the + TAO_HAS_INTERCEPTORS block to pull in TAO-specific configuration + headers. TAO_HAS_INTERCEPTORS was previously not pulled in. + Mon Sep 24 11:03:17 2001 Ossama Othman <ossama@uci.edu> * tao/PICurrent_ORBInitializer.h: diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp index 5fe36455dbf..b7fc89f2e19 100644 --- a/TAO/tao/ORB.cpp +++ b/TAO/tao/ORB.cpp @@ -1197,9 +1197,12 @@ CORBA_ORB::init_orb_globals (CORBA::Environment &ACE_TRY_ENV) #endif /* TAO_HAS_CORBA_MESSAGING == 1 */ #if TAO_HAS_INTERCEPTORS == 1 + PortableInterceptor::ORBInitializer_ptr temp_pi_initializer = + PortableInterceptor::ORBInitializer::_nil (); + PortableInterceptor::ORBInitializer_var pi_initializer; /// Register the PICurrent ORBInitializer. - ACE_NEW_THROW_EX (temp_orb_initializer, + ACE_NEW_THROW_EX (temp_pi_initializer, TAO_PICurrent_ORBInitializer, CORBA::NO_MEMORY ( CORBA_SystemException::_tao_minor_code ( @@ -1207,9 +1210,9 @@ CORBA_ORB::init_orb_globals (CORBA::Environment &ACE_TRY_ENV) ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK; - orb_initializer = temp_orb_initializer; + pi_initializer = temp_pi_initializer; - PortableInterceptor::register_orb_initializer (orb_initializer.in (), + PortableInterceptor::register_orb_initializer (pi_initializer.in (), ACE_TRY_ENV); ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS == 1 */ diff --git a/TAO/tao/PICurrent.cpp b/TAO/tao/PICurrent.cpp index 96ba368a09e..5bafcecbd16 100644 --- a/TAO/tao/PICurrent.cpp +++ b/TAO/tao/PICurrent.cpp @@ -17,6 +17,7 @@ ACE_RCSID (tao, #include "ORB_Core.h" #include "Stub.h" #include "TAO_Server_Request.h" +#include "debug.h" TAO_PICurrent::TAO_PICurrent (TAO_ORB_Core *orb_core) diff --git a/TAO/tao/PICurrent_ORBInitializer.h b/TAO/tao/PICurrent_ORBInitializer.h index f31b0ecbb40..485d7b15559 100644 --- a/TAO/tao/PICurrent_ORBInitializer.h +++ b/TAO/tao/PICurrent_ORBInitializer.h @@ -22,11 +22,12 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "LocalObject.h" + #if TAO_HAS_INTERCEPTORS == 1 #include "PortableInterceptorC.h" -#include "LocalObject.h" -#include "PICurrent.h" +#include "PICurrent.h" // This is to remove "inherits via dominance" warnings from MSVC. // MSVC is being a little too paranoid. |