summaryrefslogtreecommitdiff
path: root/TAO/tao/Strategies
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tao/Strategies')
-rw-r--r--TAO/tao/Strategies/COIOP_Profile.h3
-rw-r--r--TAO/tao/Strategies/DIOP_Acceptor.cpp2
-rw-r--r--TAO/tao/Strategies/SCIOP_Acceptor.cpp10
-rw-r--r--TAO/tao/Strategies/SCIOP_Acceptor.h4
-rw-r--r--TAO/tao/Strategies/SCIOP_Profile.cpp6
-rw-r--r--TAO/tao/Strategies/SCIOP_Profile.h6
-rw-r--r--TAO/tao/Strategies/SHMIOP_Profile.cpp6
-rw-r--r--TAO/tao/Strategies/SHMIOP_Profile.h6
-rw-r--r--TAO/tao/Strategies/UIOP_Connector.h3
-rw-r--r--TAO/tao/Strategies/advanced_resource.cpp3
10 files changed, 16 insertions, 33 deletions
diff --git a/TAO/tao/Strategies/COIOP_Profile.h b/TAO/tao/Strategies/COIOP_Profile.h
index 3a32e5e2c00..3ee737d614b 100644
--- a/TAO/tao/Strategies/COIOP_Profile.h
+++ b/TAO/tao/Strategies/COIOP_Profile.h
@@ -79,8 +79,7 @@ protected:
/// Template methods. Please see tao/Profile.h for documentation.
virtual int decode_profile (TAO_InputCDR& cdr);
- virtual void parse_string_i (const char *string
- );
+ virtual void parse_string_i (const char *string);
virtual void create_profile_body (TAO_OutputCDR &cdr) const;
virtual int decode_endpoints (void);
virtual CORBA::Boolean do_is_equivalent (const TAO_Profile *other_profile);
diff --git a/TAO/tao/Strategies/DIOP_Acceptor.cpp b/TAO/tao/Strategies/DIOP_Acceptor.cpp
index 166d0222916..0053c012e61 100644
--- a/TAO/tao/Strategies/DIOP_Acceptor.cpp
+++ b/TAO/tao/Strategies/DIOP_Acceptor.cpp
@@ -219,7 +219,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 65e10a506ff..028312365f0 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)
@@ -525,7 +525,7 @@ TAO_SCIOP_Acceptor::open_i (const ACE_Multihomed_INET_Addr& addr,
{
ACE_Multihomed_INET_Addr a(addr);
- int found_a_port = 0;
+ bool found_a_port = false;
ACE_UINT32 last_port = requested_port + this->port_span_ - 1;
if (last_port > ACE_MAX_DEFAULT_PORT)
{
@@ -547,13 +547,13 @@ TAO_SCIOP_Acceptor::open_i (const ACE_Multihomed_INET_Addr& addr,
this->accept_strategy_,
this->concurrency_strategy_) != -1)
{
- found_a_port = 1;
+ found_a_port = true;
break;
}
}
// Now, if we couldn't locate a port, we punt
- if (! found_a_port)
+ if (!found_a_port)
{
if (TAO_debug_level > 0)
TAOLIB_DEBUG ((LM_DEBUG,
@@ -1000,7 +1000,7 @@ TAO_SCIOP_Acceptor::parse_options (const char *str)
}
else if (name == "portspan")
{
- int range = static_cast<int> (ACE_OS::atoi (value.c_str ()));
+ int const range = ACE_OS::atoi (value.c_str ());
// @@ What's the lower bound on the range? zero, or one?
if (range < 1 || range > ACE_MAX_DEFAULT_PORT)
TAOLIB_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/tao/Strategies/SCIOP_Acceptor.h b/TAO/tao/Strategies/SCIOP_Acceptor.h
index d386e78f29e..ed76fe47c55 100644
--- a/TAO/tao/Strategies/SCIOP_Acceptor.h
+++ b/TAO/tao/Strategies/SCIOP_Acceptor.h
@@ -11,7 +11,6 @@
*/
// ===================================================================
-
#ifndef TAO_SCIOP_ACCEPTOR_H
#define TAO_SCIOP_ACCEPTOR_H
#include /**/ "ace/pre.h"
@@ -109,7 +108,6 @@ public:
char *&host);
protected:
-
/**
* Implement the common part of the open*() methods. This method is
* virtual to allow a derived class implementation to be invoked
@@ -204,7 +202,6 @@ protected:
TAO_ORB_Core *orb_core_;
private:
-
/// the concrete acceptor, as a pointer to it's base class.
TAO_SCIOP_BASE_ACCEPTOR base_acceptor_;
@@ -212,7 +209,6 @@ private:
TAO_SCIOP_CREATION_STRATEGY *creation_strategy_;
TAO_SCIOP_CONCURRENCY_STRATEGY *concurrency_strategy_;
TAO_SCIOP_ACCEPT_STRATEGY *accept_strategy_;
-
};
TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Strategies/SCIOP_Profile.cpp b/TAO/tao/Strategies/SCIOP_Profile.cpp
index dc81b03e23d..a5088c77aa5 100644
--- a/TAO/tao/Strategies/SCIOP_Profile.cpp
+++ b/TAO/tao/Strategies/SCIOP_Profile.cpp
@@ -132,8 +132,7 @@ TAO_SCIOP_Profile::decode_profile (TAO_InputCDR& cdr)
}
void
-TAO_SCIOP_Profile::parse_string_i (const char *ior
- )
+TAO_SCIOP_Profile::parse_string_i (const char *ior)
{
// Pull off the "hostname:port/" part of the objref
// Copy the string because we are going to modify it...
@@ -257,8 +256,7 @@ TAO_SCIOP_Profile::do_is_equivalent (const TAO_Profile *other_profile)
}
CORBA::ULong
-TAO_SCIOP_Profile::hash (CORBA::ULong max
- )
+TAO_SCIOP_Profile::hash (CORBA::ULong max)
{
// Get the hash value for all endpoints.
CORBA::ULong hashval = 0;
diff --git a/TAO/tao/Strategies/SCIOP_Profile.h b/TAO/tao/Strategies/SCIOP_Profile.h
index 5b39d19758a..0b043b1784d 100644
--- a/TAO/tao/Strategies/SCIOP_Profile.h
+++ b/TAO/tao/Strategies/SCIOP_Profile.h
@@ -75,8 +75,7 @@ public:
virtual int encode_endpoints (void);
virtual TAO_Endpoint *endpoint (void);
virtual CORBA::ULong endpoint_count (void) const;
- virtual CORBA::ULong hash (CORBA::ULong max
- );
+ virtual CORBA::ULong hash (CORBA::ULong max);
/**
* Add <endp> to this profile's list of endpoints (it is inserted
* next to the head of the list). This profiles takes ownership of
@@ -89,8 +88,7 @@ protected:
/// Template methods. Please see Profile.h for the documentation.
virtual int decode_profile (TAO_InputCDR &cdr);
virtual int decode_endpoints (void);
- virtual void parse_string_i (const char *string
- );
+ virtual void parse_string_i (const char *string);
virtual void create_profile_body (TAO_OutputCDR &cdr) const;
virtual CORBA::Boolean do_is_equivalent (const TAO_Profile *other_profile);
diff --git a/TAO/tao/Strategies/SHMIOP_Profile.cpp b/TAO/tao/Strategies/SHMIOP_Profile.cpp
index 17a3b19add8..7b43eb77f60 100644
--- a/TAO/tao/Strategies/SHMIOP_Profile.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Profile.cpp
@@ -123,8 +123,7 @@ TAO_SHMIOP_Profile::decode_profile (TAO_InputCDR& cdr)
}
void
-TAO_SHMIOP_Profile::parse_string_i (const char *string
- )
+TAO_SHMIOP_Profile::parse_string_i (const char *string)
{
// Pull off the "hostname:port/" part of the objref
// Copy the string because we are going to modify it...
@@ -284,8 +283,7 @@ TAO_SHMIOP_Profile::do_is_equivalent (const TAO_Profile *other_profile)
}
CORBA::ULong
-TAO_SHMIOP_Profile::hash (CORBA::ULong max
- )
+TAO_SHMIOP_Profile::hash (CORBA::ULong max)
{
// Get the hashvalue for all endpoints.
CORBA::ULong hashval = 0;
diff --git a/TAO/tao/Strategies/SHMIOP_Profile.h b/TAO/tao/Strategies/SHMIOP_Profile.h
index 3dce4c81f9c..666b5b633ba 100644
--- a/TAO/tao/Strategies/SHMIOP_Profile.h
+++ b/TAO/tao/Strategies/SHMIOP_Profile.h
@@ -78,8 +78,7 @@ public:
virtual int encode_endpoints (void);
virtual TAO_Endpoint *endpoint (void);
virtual CORBA::ULong endpoint_count (void) const;
- virtual CORBA::ULong hash (CORBA::ULong max
- );
+ virtual CORBA::ULong hash (CORBA::ULong max);
/**
* Add <endp> to this profile's list of endpoints (it is inserted
* next to the head of the list). This profiles takes ownership of
@@ -91,8 +90,7 @@ protected:
/// Template methods. Please see tao/Profile.h for documentation.
virtual int decode_profile (TAO_InputCDR& cdr);
- virtual void parse_string_i (const char *string
- );
+ virtual void parse_string_i (const char *string);
virtual void create_profile_body (TAO_OutputCDR &cdr) const;
virtual int decode_endpoints (void);
virtual CORBA::Boolean do_is_equivalent (const TAO_Profile *other_profile);
diff --git a/TAO/tao/Strategies/UIOP_Connector.h b/TAO/tao/Strategies/UIOP_Connector.h
index b3cafb31e62..76a974e3498 100644
--- a/TAO/tao/Strategies/UIOP_Connector.h
+++ b/TAO/tao/Strategies/UIOP_Connector.h
@@ -69,8 +69,7 @@ public:
virtual int check_prefix (const char *endpoint);
- virtual TAO_Profile *corbaloc_scan (const char *str, size_t &len
- );
+ virtual TAO_Profile *corbaloc_scan (const char *str, size_t &len);
virtual char object_key_delimiter (void) const;
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;
View Lorry Controller Status