From cfdc64a376cf1fb9e7acc3dadd7fb4815693d89d Mon Sep 17 00:00:00 2001 From: fredk Date: Mon, 24 May 1999 21:11:57 +0000 Subject: Added comments and fixed profile marshaling. --- TAO/tao/Acceptor_Registry.cpp | 3 +++ TAO/tao/Acceptor_Registry.h | 11 ----------- TAO/tao/Connector_Registry.h | 5 +++-- TAO/tao/ORB.cpp | 1 + TAO/tao/UIOP_Profile.cpp | 6 ++---- 5 files changed, 9 insertions(+), 17 deletions(-) diff --git a/TAO/tao/Acceptor_Registry.cpp b/TAO/tao/Acceptor_Registry.cpp index 2f866e98b1f..b3f655ced0d 100644 --- a/TAO/tao/Acceptor_Registry.cpp +++ b/TAO/tao/Acceptor_Registry.cpp @@ -13,6 +13,9 @@ #include "ace/Auto_Ptr.h" +typedef ACE_Unbounded_Set_Iterator + TAO_AcceptorSetItor; + TAO_Acceptor_Registry::TAO_Acceptor_Registry (void) { } diff --git a/TAO/tao/Acceptor_Registry.h b/TAO/tao/Acceptor_Registry.h index 497eca7f374..049ce70e5fc 100644 --- a/TAO/tao/Acceptor_Registry.h +++ b/TAO/tao/Acceptor_Registry.h @@ -38,17 +38,6 @@ class TAO_Resource_Factory; typedef ACE_Unbounded_Set TAO_AcceptorSet; -// @@ Fred&Ossama: Even though ye typing fingers may ache the DOC -// group style (or lack of it) is to call this stuff -// TAO_AcceptorSetIterator (not Itor). -// You may want to define this typedef inside the Acceptor_Registry -// to avoid namespace pollution. This is specially true since you -// don't export the Iterator (or the set) in the class interface, -// and it is only used in the implementation. -// -typedef ACE_Unbounded_Set_Iterator - TAO_AcceptorSetItor; - class TAO_Export TAO_Acceptor_Registry { // = TITLE diff --git a/TAO/tao/Connector_Registry.h b/TAO/tao/Connector_Registry.h index 68d6ffd5669..b556a5bf662 100644 --- a/TAO/tao/Connector_Registry.h +++ b/TAO/tao/Connector_Registry.h @@ -46,11 +46,12 @@ typedef ACE_Unbounded_Set_Iterator class TAO_Export TAO_Connector_Registry { // = TITLE + // Per ORB TAO Connector Registry + // + // = DESCRIPTION // Connector Registry and Generic Connector interface definitions. // All loaded ESIOP or GIOP connector bridges must register with // this object. - // - // = DESCRIPTION // @@ Fred: this class should be able to dynamically load a set of // connectors using the service configurator. public: diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp index 00da6fd0d43..cc28807b7d7 100644 --- a/TAO/tao/ORB.cpp +++ b/TAO/tao/ORB.cpp @@ -1408,6 +1408,7 @@ CORBA_ORB::object_to_string (CORBA::Object_ptr obj, // This only works for IIOP objrefs. If we're handed an objref // that's not an IIOP objref, fail -- application must use an // ORB that's configured differently. @@ Is this true? FRED + // @@ Need to fix!! if (obj->_stubobj () == 0) return CORBA::string_copy ((CORBA::String) TAO_IIOP_Profile::prefix ()); diff --git a/TAO/tao/UIOP_Profile.cpp b/TAO/tao/UIOP_Profile.cpp index 16d4b56eaf3..938a2eead46 100644 --- a/TAO/tao/UIOP_Profile.cpp +++ b/TAO/tao/UIOP_Profile.cpp @@ -597,11 +597,9 @@ TAO_UIOP_Profile::to_string (CORBA::Environment &env) this->object_key ()); u_int buflen = (ACE_OS::strlen (::prefix_) + - 1 /* major # */ + 1 /* minor # */ + + 2 /* major # */ + 2 /* minor # */ + 1 /* DOT */ + 2 /* double-slash separator */ + ACE_OS::strlen (this->rendezvous_point_) + - 1 /* colon separator */ + - 5 /* port number */ + 1 /* slash separator */ + ACE_OS::strlen (key) + 1 /* zero terminator */); @@ -611,7 +609,7 @@ TAO_UIOP_Profile::to_string (CORBA::Environment &env) static const char digits [] = "0123456789"; ACE_OS::sprintf (buf, - "%s%c.%c//%s/%s", + "%s%d.%d//%s/%s", ::prefix_, digits [this->version_.major], digits [this->version_.minor], -- cgit v1.2.1