summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbala <balanatarajan@users.noreply.github.com>2002-04-15 01:18:16 +0000
committerbala <balanatarajan@users.noreply.github.com>2002-04-15 01:18:16 +0000
commit3896e16886672f2dd9c716a2f07ca5652ee035bd (patch)
treee6090a8a2d2e8bf69ae8fc8248d1cb2500e7a9d0
parent38e8dba3913840c94d211f91bf3acfe0310c0501 (diff)
downloadATCD-3896e16886672f2dd9c716a2f07ca5652ee035bd.tar.gz
ChangeLogTag: Sun Apr 14 20:17:10 2002 Balachandran Natarajan <bala@cs.wustl.edu>
-rw-r--r--TAO/ChangeLogs/ChangeLog-02a4
-rw-r--r--TAO/tao/Invocation.cpp4
2 files changed, 7 insertions, 1 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 66cb8f044a6..29fb6a37314 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,7 @@
+Sun Apr 14 20:17:10 2002 Balachandran Natarajan <bala@cs.wustl.edu>
+
+ * tao/Invocation.cpp: Fixed a compile error. Improper merge :(
+
Sun Apr 14 20:08:22 2002 Balachandran Natarajan <bala@cs.wustl.edu>
* tao/Pluggable.{h,cpp,i}: Removed from the repo.
diff --git a/TAO/tao/Invocation.cpp b/TAO/tao/Invocation.cpp
index ebf3fdf7fa9..be4022059be 100644
--- a/TAO/tao/Invocation.cpp
+++ b/TAO/tao/Invocation.cpp
@@ -250,7 +250,9 @@ TAO_GIOP_Invocation::perform_call (TAO_Transport_Descriptor_Interface &desc
// Obtain a connection.
int result =
conn_reg->get_connector (desc.endpoint ())->connect (this,
- &desc);
+ &desc
+ ACE_ENV_ARG_PARAMETER);
+ ACE_CHECK_RETURN (-1);
if (result == 0)
{