diff options
| author | Nay <dnpd.dd@gmail.com> | 2012-09-17 23:50:08 +0100 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2012-09-17 23:50:08 +0100 |
| commit | 23961d0dce22e234e62f116469f04bb62d8986a7 (patch) | |
| tree | ab271f0a3fffa8f21f9ac7fd669f457beb9eb356 /dep/acelite/ace/Connector.cpp | |
| parent | 2431895a54b38e4c0e6444c740ff2298e31e26e2 (diff) | |
| parent | 2e21fa6b925c4572d620248f1b149a5d652836b2 (diff) | |
Merge remote-tracking branch 'origin/master' into mmaps
Diffstat (limited to 'dep/acelite/ace/Connector.cpp')
| -rw-r--r-- | dep/acelite/ace/Connector.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/dep/acelite/ace/Connector.cpp b/dep/acelite/ace/Connector.cpp index 3a1edfc881a..a8399608ce5 100644 --- a/dep/acelite/ace/Connector.cpp +++ b/dep/acelite/ace/Connector.cpp @@ -1,4 +1,4 @@ -// $Id: Connector.cpp 91527 2010-08-27 15:03:31Z shuston $ +// $Id: Connector.cpp 93433 2011-02-23 10:34:01Z vzykov $ #ifndef ACE_CONNECTOR_CPP #define ACE_CONNECTOR_CPP @@ -829,7 +829,7 @@ ACE_Strategy_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::open else if (this->creation_strategy_ == 0) { ACE_NEW_RETURN (this->creation_strategy_, - CREATION_STRATEGY, + CREATION_STRATEGY (0, r), -1); this->delete_creation_strategy_ = true; } @@ -887,7 +887,8 @@ ACE_Strategy_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::ACE_Strategy_Connecto ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2> *conn_s, ACE_Concurrency_Strategy<SVC_HANDLER> *con_s, int flags) - : creation_strategy_ (0), + : base_type (reactor), + creation_strategy_ (0), delete_creation_strategy_ (false), connect_strategy_ (0), delete_connect_strategy_ (false), |