diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2020-12-29 13:40:46 +0100 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2020-12-29 13:40:46 +0100 |
| commit | 1fd4e430fee005d73f91cf4e2ce9c2ac8721d9b6 (patch) | |
| tree | c0fb3bf13b84224c13fd26517a792a937639af66 /TAO/tao/Strategies | |
| parent | 4ce761b1d69d50c0c3658b1139370b44b9c626c8 (diff) | |
| parent | c6a620cc7eabece507d13986c40c955d2f226f26 (diff) | |
| download | ATCD-1fd4e430fee005d73f91cf4e2ce9c2ac8721d9b6.tar.gz | |
Merge branch 'master' into diop-portspan
Diffstat (limited to 'TAO/tao/Strategies')
| -rw-r--r-- | TAO/tao/Strategies/DIOP_Acceptor.cpp | 2 | ||||
| -rw-r--r-- | TAO/tao/Strategies/SCIOP_Acceptor.cpp | 2 | ||||
| -rw-r--r-- | TAO/tao/Strategies/advanced_resource.cpp | 3 |
3 files changed, 2 insertions, 5 deletions
diff --git a/TAO/tao/Strategies/DIOP_Acceptor.cpp b/TAO/tao/Strategies/DIOP_Acceptor.cpp index 89717e05193..2a25ad79c67 100644 --- a/TAO/tao/Strategies/DIOP_Acceptor.cpp +++ b/TAO/tao/Strategies/DIOP_Acceptor.cpp @@ -220,7 +220,7 @@ TAO_DIOP_Acceptor::is_collocated (const TAO_Endpoint *endpoint) // this code by comparing the IP address instead. That would // trigger the following bug: // - // http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=1220 + // http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=1220 // if (endp->port () == this->addrs_[i].get_port_number () && ACE_OS::strcmp (endp->host (), this->hosts_[i]) == 0) diff --git a/TAO/tao/Strategies/SCIOP_Acceptor.cpp b/TAO/tao/Strategies/SCIOP_Acceptor.cpp index 894b20cf2c4..ad4ae5e451a 100644 --- a/TAO/tao/Strategies/SCIOP_Acceptor.cpp +++ b/TAO/tao/Strategies/SCIOP_Acceptor.cpp @@ -190,7 +190,7 @@ TAO_SCIOP_Acceptor::is_collocated (const TAO_Endpoint *endpoint) // this code by comparing the IP address instead. That would // trigger the following bug: // - // http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=1220 + // http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=1220 // if (endp->port() == this->addrs_[i].get_port_number() && ACE_OS::strcmp(endp->host(), this->hosts_[i]) == 0) diff --git a/TAO/tao/Strategies/advanced_resource.cpp b/TAO/tao/Strategies/advanced_resource.cpp index d2243029e0d..b4fdb54c24b 100644 --- a/TAO/tao/Strategies/advanced_resource.cpp +++ b/TAO/tao/Strategies/advanced_resource.cpp @@ -424,7 +424,6 @@ TAO_Advanced_Resource_Factory::allocate_reactor_impl (void) const // get a timer queue (or not) from a possibly configured // time policy TAO_RSF_Timer_Queue_Ptr tmq (*this, this->create_timer_queue ()); -//@@ TAO_ADVANCED_RESOURCE_REACTOR_SPL_COMMENT_HOOK_START switch (this->reactor_type_) { case TAO_REACTOR_SELECT_MT: @@ -496,8 +495,6 @@ TAO_Advanced_Resource_Factory::allocate_reactor_impl (void) const break; } -//@@ TAO_ADVANCED_RESOURCE_REACTOR_SPL_COMMENT_HOOK_END - // safe to release timer queue tmq.release (); return impl; |