diff options
| -rw-r--r-- | ACE/ace/Connector.cpp | 6 | ||||
| -rw-r--r-- | ACE/ace/Unbounded_Set.h | 1 | ||||
| -rw-r--r-- | ACE/ace/Unbounded_Set_Ex.h | 2 | ||||
| -rw-r--r-- | TAO/tao/On_Demand_Fragmentation_Strategy.h | 3 |
4 files changed, 3 insertions, 9 deletions
diff --git a/ACE/ace/Connector.cpp b/ACE/ace/Connector.cpp index 1303ab9ca11..2464a0a2a6e 100644 --- a/ACE/ace/Connector.cpp +++ b/ACE/ace/Connector.cpp @@ -104,7 +104,7 @@ ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::close (SVC_HANDLER *&sh) // Remember the Svc_Handler. sh = this->svc_handler_; - ACE_HANDLE h = sh->get_handle (); + ACE_HANDLE const h = sh->get_handle (); this->svc_handler_ = 0; // Remove this handle from the set of non-blocking handles @@ -565,7 +565,7 @@ ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::nonblocking_connect ACE_GUARD_RETURN (ACE_Lock, ace_mon, this->reactor ()->lock (), -1); // Register handle with the reactor for connection events. - ACE_Reactor_Mask mask = ACE_Event_Handler::CONNECT_MASK; + ACE_Reactor_Mask const mask = ACE_Event_Handler::CONNECT_MASK; if (this->reactor ()->register_handler (handle, nbch, mask) == -1) @@ -627,7 +627,7 @@ ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::initialize_svc_handler { // Try to find out if the reactor uses event associations for the // handles it waits on. If so we need to reset it. - bool reset_new_handle = + bool const reset_new_handle = this->reactor ()->uses_event_associations (); if (reset_new_handle) diff --git a/ACE/ace/Unbounded_Set.h b/ACE/ace/Unbounded_Set.h index 890b4413b83..56dc0fbdedd 100644 --- a/ACE/ace/Unbounded_Set.h +++ b/ACE/ace/Unbounded_Set.h @@ -60,7 +60,6 @@ class ACE_Unbounded_Set_Const_Iterator : public ACE_Unbounded_Set_Ex_Const_Iterator<T, ACE_Unbounded_Set_Default_Comparator<T> > { public: - typedef ACE_Unbounded_Set_Ex_Const_Iterator<T, ACE_Unbounded_Set_Default_Comparator<T> > base_type; ACE_Unbounded_Set_Const_Iterator (const ACE_Unbounded_Set<T> &s, diff --git a/ACE/ace/Unbounded_Set_Ex.h b/ACE/ace/Unbounded_Set_Ex.h index b1f3707a309..7d5a3a4b6e3 100644 --- a/ACE/ace/Unbounded_Set_Ex.h +++ b/ACE/ace/Unbounded_Set_Ex.h @@ -93,7 +93,6 @@ public: ACE_ALLOC_HOOK_DECLARE; private: - /// Pointer to the current node in the iteration. ACE_Node<T, C> *current_; @@ -161,7 +160,6 @@ public: ACE_ALLOC_HOOK_DECLARE; private: - /// Pointer to the current node in the iteration. ACE_Node<T, C> *current_; diff --git a/TAO/tao/On_Demand_Fragmentation_Strategy.h b/TAO/tao/On_Demand_Fragmentation_Strategy.h index 10f6e83a873..ef893a8849a 100644 --- a/TAO/tao/On_Demand_Fragmentation_Strategy.h +++ b/TAO/tao/On_Demand_Fragmentation_Strategy.h @@ -52,19 +52,16 @@ public: ACE_CDR::ULong pending_length); private: - // Disallow copying and assignment. TAO_On_Demand_Fragmentation_Strategy (TAO_On_Demand_Fragmentation_Strategy const &); void operator= (TAO_On_Demand_Fragmentation_Strategy const &); private: - /// Pointer to the underlying transport object. TAO_Transport * const transport_; /// Size of GIOP message at which fragmentation will occur. ACE_CDR::ULong const max_message_size_; - }; TAO_END_VERSIONED_NAMESPACE_DECL |