diff options
| author | doccvs <doccvs@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-12-22 23:19:39 +0000 |
|---|---|---|
| committer | doccvs <doccvs@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-12-22 23:19:39 +0000 |
| commit | dfcf08096c8ef30917cd285af764c7ccdf54e3d8 (patch) | |
| tree | 9f22de65e3dcfd1ee7fed9a704669012f22a2f87 | |
| parent | c624a872c99ecd273051270c25f7598bd8e50b8d (diff) | |
| download | ATCD-dfcf08096c8ef30917cd285af764c7ccdf54e3d8.tar.gz | |
ChangeLogTag: Fri Dec 22 15:11:00 2000 Priyanka Gontla <pgontla@ece.uci.edu>
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 5 | ||||
| -rw-r--r-- | TAO/tao/ORB_Core.cpp | 11 |
2 files changed, 12 insertions, 4 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 0bdebb03f41..b8681b7ba0c 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,8 @@ +Fri Dec 22 15:11:00 2000 Priyanka Gontla <pgontla@ece.uci.edu> + + * tao/ORB_Core.cpp: + Added TAO_HAS_RT_CORBA guard. + Fri Dec 22 15:02:00 2000 Priyanka Gontla <pgontla@ece.uci.edu> * tao/ORB_Core.h : diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp index ec840ce117f..d2dd93d7954 100644 --- a/TAO/tao/ORB_Core.cpp +++ b/TAO/tao/ORB_Core.cpp @@ -58,11 +58,14 @@ TAO_default_environment () TAO_ORB_Core::Timeout_Hook TAO_ORB_Core::timeout_hook_ = 0; TAO_ORB_Core::Sync_Scope_Hook TAO_ORB_Core::sync_scope_hook_ = 0; -CORBA::Object_ptr TAO_ORB_Core::priority_mapping_manager_ = 0; const char * TAO_ORB_Core::resource_factory_name_ = "Resource_Factory"; const char *TAO_ORB_Core::protocols_hooks_name_ = "Protocols_Hooks"; const char * TAO_ORB_Core::dynamic_adapter_name_ = "Dynamic_Adapter"; +#if (TAO_HAS_RT_CORBA == 1) +CORBA::Object_ptr TAO_ORB_Core::priority_mapping_manager_ = 0; +#endif /* TAO_HAS_RT_CORBA == 1 */ + TAO_ORB_Core::TAO_ORB_Core (const char *orbid) : protocols_hooks_ (0), lock_ (), @@ -1932,7 +1935,7 @@ void TAO_ORB_Core::resolve_rt_orb_i (CORBA::Environment &ACE_TRY_ENV) { // @@ - TAO_Object_Loader *loader = + TAO_Object_Loader *loader = ACE_Dynamic_Service<TAO_Object_Loader>::instance ("RT_ORB_Loader"); if (loader == 0) @@ -1953,7 +1956,7 @@ TAO_ORB_Core::resolve_rt_orb_i (CORBA::Environment &ACE_TRY_ENV) /// Create RT_ORB object. this->rt_orb_ = loader->create_object (this->orb_.in (), 0, 0, ACE_TRY_ENV); - + } #endif /* TAO_HAS_RT_CORBA == 1 */ @@ -2555,7 +2558,7 @@ TAO_ORB_Core::priority_mapping_manager (void) void TAO_ORB_Core::priority_mapping_manager (CORBA::Object_ptr manager) { - TAO_ORB_Core::priority_mapping_manager_ = + TAO_ORB_Core::priority_mapping_manager_ = CORBA::Object::_duplicate (manager); } |