summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2012-11-05 08:26:31 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2012-11-05 08:26:31 +0000
commit643cd73014dd3507c130328ebf240ed3dfe93dae (patch)
tree8c3729e89cf25347ec521ff31e28424217f93be6
parent5bad0aff3847c85f0d3791faa01ccad9b5475dde (diff)
downloadATCD-643cd73014dd3507c130328ebf240ed3dfe93dae.tar.gz
Mon Nov 5 08:25:48 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>
* tao/Cache_Entries_T.h: Use bool instead of CORBA::Boolean * tao/LocateRequest_Invocation.cpp: * tao/Transport.h: * tao/Transport_Cache_Manager_T.cpp: * tao/Transport_Connector.cpp: Const, layout, and doxygen changes
-rw-r--r--TAO/ChangeLog11
-rw-r--r--TAO/tao/Cache_Entries_T.h2
-rw-r--r--TAO/tao/LocateRequest_Invocation.cpp2
-rw-r--r--TAO/tao/Transport.h4
-rw-r--r--TAO/tao/Transport_Cache_Manager_T.cpp4
-rw-r--r--TAO/tao/Transport_Connector.cpp5
6 files changed, 18 insertions, 10 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 8d907858a73..fab95be33f5 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,14 @@
+Mon Nov 5 08:25:48 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * tao/Cache_Entries_T.h:
+ Use bool instead of CORBA::Boolean
+
+ * tao/LocateRequest_Invocation.cpp:
+ * tao/Transport.h:
+ * tao/Transport_Cache_Manager_T.cpp:
+ * tao/Transport_Connector.cpp:
+ Const, layout, and doxygen changes
+
Wed Oct 31 09:09:25 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>
* tao/PortableServer/Root_POA.cpp:
diff --git a/TAO/tao/Cache_Entries_T.h b/TAO/tao/Cache_Entries_T.h
index 7ff66c64f85..76d41160432 100644
--- a/TAO/tao/Cache_Entries_T.h
+++ b/TAO/tao/Cache_Entries_T.h
@@ -194,7 +194,7 @@ namespace TAO
transport_descriptor_type *transport_property_;
/// Do we need to delete transport_property?
- CORBA::Boolean is_delete_;
+ bool is_delete_;
/**
* This is a supplementary index. Would be set to zero by
diff --git a/TAO/tao/LocateRequest_Invocation.cpp b/TAO/tao/LocateRequest_Invocation.cpp
index 9b1a9768335..6e6b173d912 100644
--- a/TAO/tao/LocateRequest_Invocation.cpp
+++ b/TAO/tao/LocateRequest_Invocation.cpp
@@ -126,7 +126,7 @@ namespace TAO
countdown.update ();
// For some strategies one may want to release the transport
- // back to cache. If the idling is successful let the
+ // back to cache. If the idling is successful let the
// resolver about that.
if (this->resolver_.transport ()->idle_after_send ())
this->resolver_.transport_released ();
diff --git a/TAO/tao/Transport.h b/TAO/tao/Transport.h
index 543b9fb668c..20b69828829 100644
--- a/TAO/tao/Transport.h
+++ b/TAO/tao/Transport.h
@@ -544,8 +544,8 @@ public:
* thread can execute it on the same instance concurrently.
*
* @param buffer ORB allocated buffer where the data should be
- * @@ The ACE_Time_Value *s is just a place holder for now. It is
- * not clear this this is the best place to specify this. The actual
+ * @param timeout The ACE_Time_Value *s is just a place holder for now. It is
+ * not clear this this is the best place to specify this. The actual
* timeout values will be kept in the Policies.
*/
virtual ssize_t recv (char *buffer,
diff --git a/TAO/tao/Transport_Cache_Manager_T.cpp b/TAO/tao/Transport_Cache_Manager_T.cpp
index 00ba766b6e7..e4b903bc5b0 100644
--- a/TAO/tao/Transport_Cache_Manager_T.cpp
+++ b/TAO/tao/Transport_Cache_Manager_T.cpp
@@ -236,8 +236,7 @@ namespace TAO
return CACHE_FOUND_NONE;
}
- Find_Result find_result = this->find (
- prop, transport, busy_count);
+ Find_Result const find_result = this->find (prop, transport, busy_count);
if (find_result != CACHE_FOUND_NONE)
{
if (find_result == CACHE_FOUND_AVAILABLE)
@@ -300,7 +299,6 @@ namespace TAO
if (this->is_entry_available_i (*entry))
{
// Successfully found a transport_type.
-
found = CACHE_FOUND_AVAILABLE;
found_entry = entry;
entry->item ().recycle_state (ENTRY_BUSY);
diff --git a/TAO/tao/Transport_Connector.cpp b/TAO/tao/Transport_Connector.cpp
index 160eec30b83..b717d8027fd 100644
--- a/TAO/tao/Transport_Connector.cpp
+++ b/TAO/tao/Transport_Connector.cpp
@@ -312,7 +312,7 @@ TAO_Connector::parallel_connect (TAO::Profile_Transport_Resolver *r,
TAO_Base_Transport_Property desc2(ep,0);
size_t busy_count = 0;
if (tcm.find_transport (&desc2, base_transport, busy_count) ==
- TAO::Transport_Cache_Manager::CACHE_FOUND_AVAILABLE )
+ TAO::Transport_Cache_Manager::CACHE_FOUND_AVAILABLE)
{
if (TAO_debug_level)
{
@@ -561,7 +561,6 @@ TAO_Connector::connect (TAO::Profile_Transport_Resolver *r,
// invocation is done with it. In that case it is up to
// a subsequent invocation to handle the connection
// completion.
-
TransportCleanupGuard tg(base_transport);
if (!this->wait_for_connection_completion (r, *desc,
base_transport,
@@ -651,7 +650,7 @@ TAO_Connector::connect (TAO::Profile_Transport_Resolver *r,
// @todo: This is not the right place for this! (bugzilla 3023)
// Purge connections (if necessary)
tcm.purge ();
- bool make_new_connection =
+ bool const make_new_connection =
(found == TAO::Transport_Cache_Manager::CACHE_FOUND_NONE) ||
(found == TAO::Transport_Cache_Manager::CACHE_FOUND_BUSY
&& this->new_connection_is_ok (busy_count));