diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2002-04-15 12:41:13 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2002-04-15 12:41:13 +0000 |
| commit | a86170469b346f91bb617558e98b0add77ac962f (patch) | |
| tree | e4c17f3585ffd69ffd593879a992fa599efd0975 | |
| parent | ecfecf5cce07183180b20aa806e7c1d4aa8f5997 (diff) | |
| download | ATCD-a86170469b346f91bb617558e98b0add77ac962f.tar.gz | |
ChangeLogTag: Mon Apr 15 07:37:02 2002 Balachandran Natarajan <bala@cs.wustl.edu>
4 files changed, 19 insertions, 12 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 78ffceaf252..e737c73b25c 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,12 @@ +Mon Apr 15 07:37:02 2002 Balachandran Natarajan <bala@cs.wustl.edu> + + * orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp: + * orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h: Removed support + for preconnects. Fixed compiler errors with g++. + + * orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h: + Forward declared TAO_Profile to avoid compile errors. + Mon Apr 15 07:12:12 2002 Balachandran Natarajan <bala@cs.wustl.edu> * performance-tests/Cubit/TAI/IDL_Cubit/Makefile: diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h index 830bb5150aa..2c806dd7b79 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h @@ -28,6 +28,8 @@ #include "ace/Unbounded_Queue.h" #include "tao/Resource_Factory.h" +class TAO_Profile; + /** * @class TAO_PortableGroup_Acceptor_Registry * diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp index d364e2abfc4..46122dd69d8 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp @@ -86,9 +86,9 @@ TAO_UIPMC_Connector::close (void) } int -TAO_UIPMC_Connector::connect (TAO_GIOP_Invocation *invocation, - TAO_Transport_Descriptor_Interface *desc - ACE_ENV_ARG_DECL_NOT_USED) +TAO_UIPMC_Connector::make_connect (TAO_GIOP_Invocation *invocation, + TAO_Transport_Descriptor_Interface *desc) + { TAO_Transport *&transport = invocation->transport (); // ACE_Time_Value *max_wait_time = invocation->max_wait_time (); @@ -156,13 +156,6 @@ TAO_UIPMC_Connector::connect (TAO_GIOP_Invocation *invocation, return 0; } -int -TAO_UIPMC_Connector::preconnect (const char *) -{ - // @@ Michael: We do not support preconnects. - return 0; -} - TAO_Profile * TAO_UIPMC_Connector::create_profile (TAO_InputCDR& cdr) { diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h index 4bd0ddc6bc1..019292db342 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h @@ -54,7 +54,6 @@ public: int connect (TAO_GIOP_Invocation *invocation, TAO_Transport_Descriptor_Interface *desc ACE_ENV_ARG_DECL); - int preconnect (const char *preconnections); TAO_Profile *create_profile (TAO_InputCDR& cdr); virtual int check_prefix (const char *endpoint); @@ -63,13 +62,17 @@ public: protected: /// = More TAO_Connector methods, please check the documentation on - /// Pluggable.h + /// TAO_Connector.h + int make_connect(TAO_GIOP_Invocation *, + TAO_Transport_Descriptor_Interface *); + virtual TAO_Profile * make_profile (ACE_ENV_SINGLE_ARG_DECL); /// Obtain UIPMC properties that must be used by this connector, i.e., /// initialize <uipmc_properties_>. int init_uipmc_properties (void); + protected: /// UIPMC configuration properties to be used for all |