summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2002-08-26 08:10:37 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2002-08-26 08:10:37 +0000
commita6f9c1f6b9573cccf4ea921d9846e2c7238dc9d3 (patch)
tree14974e6d3c57ffabde8792d61c4421dd8e79874a
parent6d41d1ab5205d01396f337104c44401cda430e81 (diff)
downloadATCD-a6f9c1f6b9573cccf4ea921d9846e2c7238dc9d3.tar.gz
ChangeLogTag: Mon Aug 26 10:09:12 2002 Johnny Willemsen <jwillemsen@remedy.nl>
-rw-r--r--ChangeLog4
-rw-r--r--ChangeLogs/ChangeLog-03a4
-rw-r--r--ace/TLI_Connector.i30
-rw-r--r--ace/XTI_ATM_Mcast.i56
4 files changed, 51 insertions, 43 deletions
diff --git a/ChangeLog b/ChangeLog
index bbc46ed9a5f..9778b95dbcc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,10 @@ Mon Aug 26 09:51:12 UTC 2002 Johnny Willemsen <jwillemsen@remedy.nl>
same as in the base class. That way doxygen generates the same
documentation for this overruled method as in the base.
+ * ace/TLI_Connector.i:
+ * ace/XTI_ATM_MCast.i:
+ Made argument names the same as in the header file.
+
Mon Aug 26 08:29:12 UTC 2002 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/Connector.cpp:
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index bbc46ed9a5f..9778b95dbcc 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -7,6 +7,10 @@ Mon Aug 26 09:51:12 UTC 2002 Johnny Willemsen <jwillemsen@remedy.nl>
same as in the base class. That way doxygen generates the same
documentation for this overruled method as in the base.
+ * ace/TLI_Connector.i:
+ * ace/XTI_ATM_MCast.i:
+ Made argument names the same as in the header file.
+
Mon Aug 26 08:29:12 UTC 2002 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/Connector.cpp:
diff --git a/ace/TLI_Connector.i b/ace/TLI_Connector.i
index e40a1c2637c..9aa873dcd1f 100644
--- a/ace/TLI_Connector.i
+++ b/ace/TLI_Connector.i
@@ -4,30 +4,30 @@
// TLI_Connector.i
ACE_INLINE
-ACE_TLI_Connector::ACE_TLI_Connector (ACE_TLI_Stream &new_stream,
- const ACE_Addr &remote_sap,
- ACE_Time_Value *timeout,
- const ACE_Addr &local_sap,
- int reuse_addr,
- int flags,
- int perms,
- const char device[],
- struct t_info *info,
- int rwf,
- netbuf *udata,
- netbuf *opt)
+ACE_TLI_Connector::ACE_TLI_Connector (ACE_TLI_Stream &new_stream,
+ const ACE_Addr &remote_sap,
+ ACE_Time_Value *timeout,
+ const ACE_Addr &local_sap,
+ int reuse_addr,
+ int flags,
+ int perms,
+ const char device[],
+ struct t_info *info,
+ int rw_flag,
+ netbuf *udata,
+ netbuf *opt)
{
ACE_TRACE ("ACE_TLI_Connector::ACE_TLI_Connector");
if (this->connect (new_stream,
remote_sap,
timeout,
local_sap,
- reuse_addr,
+ reuse_addr,
flags,
perms,
- device,
+ device,
info,
- rwf,
+ rw_flag,
udata,
opt) == -1
&& timeout != 0 && !(errno == EWOULDBLOCK || errno == ETIME))
diff --git a/ace/XTI_ATM_Mcast.i b/ace/XTI_ATM_Mcast.i
index 2baab539fc8..0084c64a8da 100644
--- a/ace/XTI_ATM_Mcast.i
+++ b/ace/XTI_ATM_Mcast.i
@@ -4,24 +4,24 @@
// XTI_ATM_Mcast.i
ACE_INLINE
-ACE_XTI_ATM_Mcast::ACE_XTI_ATM_Mcast (ACE_TLI_Stream &new_stream,
- const ACE_Addr &remote_sap,
- ACE_Time_Value *timeout,
- const ACE_Addr &local_sap,
- int reuse_addr,
- int flags,
- int perms,
- const char device[],
- struct t_info *info,
- int rwf,
- netbuf *udata,
- netbuf *opt)
+ACE_XTI_ATM_Mcast::ACE_XTI_ATM_Mcast (ACE_TLI_Stream &new_stream,
+ const ACE_Addr &remote_sap,
+ ACE_Time_Value *timeout,
+ const ACE_Addr &local_sap,
+ int reuse_addr,
+ int flags,
+ int perms,
+ const char device[],
+ struct t_info *info,
+ int rw_flag,
+ netbuf *udata,
+ netbuf *opt)
{
ACE_TRACE ("ACE_XTI_ATM_Mcast::ACE_XTI_ATM_Mcast");
- if (this->connect (new_stream, remote_sap, timeout, local_sap, reuse_addr,
- flags, perms, device,
- info, rwf,
- udata, opt) == ACE_INVALID_HANDLE
+ if (this->connect (new_stream, remote_sap, timeout, local_sap, reuse_addr,
+ flags, perms, device,
+ info, rw_flag,
+ udata, opt) == ACE_INVALID_HANDLE
&& timeout != 0 && !(errno == EWOULDBLOCK || errno == ETIME))
ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), ACE_LIB_TEXT ("ACE_TLI_Stream::ACE_TLI_Stream")));
}
@@ -33,18 +33,18 @@ ACE_XTI_ATM_Mcast::ACE_XTI_ATM_Mcast (ACE_TLI_Stream &new_stream,
ACE_INLINE
int
-ACE_XTI_ATM_Mcast::connect (ACE_TLI_Stream &new_stream,
- const ACE_Addr &remote_sap,
- ACE_Time_Value *timeout,
- const ACE_Addr &local_sap,
- int reuse_addr,
- int flags,
- int perms,
- const char device[],
- struct t_info *info,
- int rw_flag,
- netbuf *udata,
- netbuf *opt)
+ACE_XTI_ATM_Mcast::connect (ACE_TLI_Stream &new_stream,
+ const ACE_Addr &remote_sap,
+ ACE_Time_Value *timeout,
+ const ACE_Addr &local_sap,
+ int reuse_addr,
+ int flags,
+ int perms,
+ const char device[],
+ struct t_info *info,
+ int rw_flag,
+ netbuf *udata,
+ netbuf *opt)
{
ACE_TRACE ("ACE_XTI_ATM_Mcast::connect");
return ACE_TLI_Connector::connect(new_stream,