summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2004-08-18 08:51:59 +0000
committersma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2004-08-18 08:51:59 +0000
commit93c3081d0460665a9045572ae3b79bbe049f313c (patch)
tree7bc974356877e0a9a1f6a6eb032971544bd740fd
parenta115f65bf1b7f1c483679f6e0c326a36161642e2 (diff)
downloadATCD-93c3081d0460665a9045572ae3b79bbe049f313c.tar.gz
ChangeLogTag: Wed Aug 18 08:50:00 UTC 2004 Simon Massey <simon.massey@prismtechnologies.com>
-rw-r--r--ChangeLog15
-rw-r--r--ace/Asynch_Connector.cpp2
-rw-r--r--ace/Asynch_Connector.h4
3 files changed, 17 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 71f0c5fea48..e2e52116ab3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,19 @@
+Wed Aug 18 08:50:00 UTC 2004 Simon Massey <simon.massey@prismtechnologies.com>
+ * ace/Asynch_Connector.h
+ * ace/Asynch_Connector.cpp
+ Thanks to Douglas for his assistance. This change introduces a class-static
+ "local_default" for use as the default parameter for the second attribute of
+ ACE_Asynch_Connector<>::connect(). This "simplifies" the nested templated
+ class for the Solaris Lynxos GCC295 cross compiler which was faulting due to
+ the complexity of this definition. This change does not appreachiably modify
+ the signature of the member function, just stops clients from having to
+ create their own local default parameter.
+
Wed Aug 18 01:05:37 2004 J.T. Conklin <jtc@acorntoolworks.com>
- * include/makeinclude/platform_netbsd.GNU:
+ * include/makeinclude/platform_netbsd.GNU:
- Update to support current NetBSD platforms.
+ Update to support current NetBSD platforms.
Tue Aug 17 21:03:08 2004 J.T. Conklin <jtc@acorntoolworks.com>
diff --git a/ace/Asynch_Connector.cpp b/ace/Asynch_Connector.cpp
index e13bdc6bfa7..d8cc7b03fd0 100644
--- a/ace/Asynch_Connector.cpp
+++ b/ace/Asynch_Connector.cpp
@@ -22,6 +22,8 @@ ACE_RCSID(ace, Asynch_Connector, "$Id$")
#include "ace/Message_Block.h"
#include "ace/INET_Addr.h"
+template <class HANDLER>
+const ACE_INET_Addr ACE_Asynch_Connector<HANDLER>::local_default = (u_short) 0;
template <class HANDLER>
ACE_Asynch_Connector<HANDLER>::ACE_Asynch_Connector (void)
diff --git a/ace/Asynch_Connector.h b/ace/Asynch_Connector.h
index 8b00b9544af..c1e9a34fb70 100644
--- a/ace/Asynch_Connector.h
+++ b/ace/Asynch_Connector.h
@@ -44,6 +44,7 @@ template <class HANDLER>
class ACE_Asynch_Connector : public ACE_Handler
{
public:
+ static const ACE_INET_Addr local_default;
/// A do nothing constructor.
ACE_Asynch_Connector (void);
@@ -60,8 +61,7 @@ public:
/// This initiates a new asynchronous connect
virtual int connect (const ACE_INET_Addr &remote_sap,
- const ACE_INET_Addr &local_sap =
- ACE_INET_Addr ((u_short)0),
+ const ACE_INET_Addr &local_sap = local_default,
int reuse_addr = 1,
const void *act = 0);