summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbala <balanatarajan@users.noreply.github.com>2002-11-02 02:14:53 +0000
committerbala <balanatarajan@users.noreply.github.com>2002-11-02 02:14:53 +0000
commit9e0b7ddfc88af97a796221276ece04be18256f83 (patch)
tree710567a6d292d3de1303623fcc86ad56b5b2211a
parentb45024636f534f1b680a97a7cb0fef63fe201a56 (diff)
downloadATCD-9e0b7ddfc88af97a796221276ece04be18256f83.tar.gz
ChangeLogTag: Fri Nov 1 20:12:09 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu>
-rw-r--r--TAO/ChangeLog10
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h3
2 files changed, 13 insertions, 0 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index d3b8c9ca466..cc257cde038 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,13 @@
+Fri Nov 1 20:12:09 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu>
+
+ * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp (connect):
+ * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h: Added the overloaded
+ connect () method without the timeout. The implementation just
+ calls the method with timeout value. It shouldnt be necessary,
+ but one build in the borland compiler warns about one of the
+ connect () methods hiding the other one. Hopefully, this should
+ resolve the warning.
+
Fri Nov 01 20:09:44 2002 Pradeep Gore <pradeep@oomworks.com>
* orbsvcs/tests/Notify/Basic/AdminProperties_Test.dsp:
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h
index 8f191034ccb..745671f7ead 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h
@@ -58,6 +58,9 @@ public:
virtual int open (TAO_ORB_Core *orb_core);
virtual int close (void);
virtual int connect (TAO_GIOP_Invocation *invocation,
+ TAO_Transport_Descriptor_Interface *desc
+ ACE_ENV_ARG_DECL);
+ virtual int connect (TAO_GIOP_Invocation *invocation,
TAO_Transport_Descriptor_Interface *desc,
ACE_Time_Value *timeout
ACE_ENV_ARG_DECL);