diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-09-02 23:17:41 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-09-02 23:17:41 +0000 |
| commit | a6093e17447be4d9a53529657f4f191a5c5bd93b (patch) | |
| tree | 3f88b1ae8436c1e63a79822db936b0e8f4c8a6ee | |
| parent | 6a6c564c5c9eefd4551acd6b19906fcc0641d64c (diff) | |
| download | ATCD-a6093e17447be4d9a53529657f4f191a5c5bd93b.tar.gz | |
ChangeLogTag:Wed Sep 2 18:16:32 1998 Carlos O'Ryan <coryan@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLog-98c | 5 | ||||
| -rw-r--r-- | TAO/orbsvcs/Trading_Service/Trading_Service.cpp | 17 |
2 files changed, 5 insertions, 17 deletions
diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c index b01d1709b4c..8a781bc1379 100644 --- a/TAO/ChangeLog-98c +++ b/TAO/ChangeLog-98c @@ -1,3 +1,8 @@ +Wed Sep 2 18:16:32 1998 Carlos O'Ryan <coryan@cs.wustl.edu> + + * orbsvcs/Trading_Service/Trading_Service.cpp: + Removed some TAO_HAS_OBJECT_IN_STRUCT_MARSHAL_BUG uses. + Wed Sep 02 16:59:56 1998 Douglas C. Schmidt <schmidt@cs.wustl.edu> * TAO version 0.2.7 released. diff --git a/TAO/orbsvcs/Trading_Service/Trading_Service.cpp b/TAO/orbsvcs/Trading_Service/Trading_Service.cpp index 167344f8547..ad671de5ca2 100644 --- a/TAO/orbsvcs/Trading_Service/Trading_Service.cpp +++ b/TAO/orbsvcs/Trading_Service/Trading_Service.cpp @@ -236,15 +236,7 @@ Trading_Service::bootstrap_to_federation (void) TAO_CHECK_ENV; CosTrading::Lookup_ptr remote_lookup; -#ifdef TAO_HAS_OBJECT_IN_STRUCT_MARSHAL_BUG - CORBA::Object_var obj = - orb->string_to_object (link_info->target, TAO_TRY_ENV); - TAO_CHECK_ENV; - remote_lookup = CosTrading::Lookup::_narrow (obj.in (), TAO_TRY_ENV); - TAO_CHECK_ENV; -#else remote_lookup = link_info->target.in (); -#endif /* TAO_HAS_OBJECT_IN_STRUCT_MARSHAL_BUG */ ACE_DEBUG ((LM_DEBUG, "*** Retrieving its link interface.\n")); CosTrading::Link_var remote_link = @@ -308,16 +300,7 @@ Trading_Service::shutdown (void) TAO_CHECK_ENV; CosTrading::Lookup_ptr remote_lookup; -#ifdef TAO_HAS_OBJECT_IN_STRUCT_MARSHAL_BUG - CORBA::ORB_var orb = this->orb_manager_.orb (); - CORBA::Object_var obj = - orb->string_to_object (link_info->target, TAO_TRY_ENV); - TAO_CHECK_ENV; - remote_lookup = CosTrading::Lookup::_narrow (obj.in (), TAO_TRY_ENV); - TAO_CHECK_ENV; -#else remote_lookup = link_info->target.in (); -#endif /* TAO_HAS_OBJECT_IN_STRUCT_MARSHAL_BUG */ ACE_DEBUG ((LM_DEBUG, "*** Retrieving its link interface.\n")); CosTrading::Link_var remote_link = |