diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2020-01-28 13:48:09 +0100 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2020-01-28 13:48:09 +0100 |
commit | 1540f6900d923c6f4548c90dde09bb4d6175a45a (patch) | |
tree | be79e35f618a2095dca5833ae799a6bf0861e6d9 | |
parent | 3384df595ff0b98f167f2015045eb8ad0bb9ae2a (diff) | |
download | ATCD-1540f6900d923c6f4548c90dde09bb4d6175a45a.tar.gz |
Layout changes
* TAO/tao/AnyTypeCode/Alias_TypeCode.h:
* TAO/tao/AnyTypeCode/Alias_TypeCode_Static.h:
* TAO/tao/AnyTypeCode/Enum_TypeCode.h:
* TAO/tao/AnyTypeCode/Enum_TypeCode_Static.h:
* TAO/tao/AnyTypeCode/Fixed_TypeCode.h:
* TAO/tao/AnyTypeCode/Indirected_Type_TypeCode.h:
* TAO/tao/AnyTypeCode/NVList.h:
* TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h:
* TAO/tao/AnyTypeCode/Sequence_TypeCode.h:
* TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.h:
* TAO/tao/AnyTypeCode/String_TypeCode.h:
* TAO/tao/AnyTypeCode/String_TypeCode_Static.h:
* TAO/tao/AnyTypeCode/Struct_TypeCode_Static.h:
* TAO/tao/AnyTypeCode/TypeCode.h:
* TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.h:
* TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h:
* TAO/tao/AnyTypeCode/TypeCode_Case_T.h:
* TAO/tao/AnyTypeCode/Value_TypeCode_Static.h:
* TAO/tao/BiDir_GIOP/BiDirGIOP.cpp:
* TAO/tao/CDR.h:
* TAO/tao/CORBALOC_Parser.h:
* TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.h:
* TAO/tao/CSD_Framework/CSD_POA.h:
* TAO/tao/CSD_Framework/CSD_Strategy_Base.h:
* TAO/tao/CSD_Framework/CSD_Strategy_Proxy.h:
* TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.h:
* TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.h:
* TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.h:
* TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request.h:
* TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.h:
* TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.h:
* TAO/tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.h:
* TAO/tao/CSD_ThreadPool/CSD_TP_Queue.h:
* TAO/tao/CSD_ThreadPool/CSD_TP_Request.h:
* TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State.h:
* TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.h:
* TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.h:
* TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.h:
* TAO/tao/CSD_ThreadPool/CSD_TP_Task.h:
* TAO/tao/Collocated_Invocation.h:
* TAO/tao/Connector_Impl.h:
* TAO/tao/Default_Endpoint_Selector_Factory.h:
* TAO/tao/Default_Thread_Lane_Resources_Manager.h:
* TAO/tao/DiffServPolicy/DiffServPolicy_ORBInitializer.h:
* TAO/tao/DiffServPolicy/Server_Network_Priority_Policy.h:
* TAO/tao/DynamicAny/DynCommon.h:
* TAO/tao/DynamicInterface/DII_Invocation_Adapter.h:
* TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp:
* TAO/tao/DynamicInterface/Dynamic_Implementation.h:
* TAO/tests/Connection_Failure/README:
* TAO/tests/Crashed_Callback/README:
51 files changed, 10 insertions, 111 deletions
diff --git a/TAO/tao/AnyTypeCode/Alias_TypeCode.h b/TAO/tao/AnyTypeCode/Alias_TypeCode.h index 3f9fa044c24..af8d71d9d24 100644 --- a/TAO/tao/AnyTypeCode/Alias_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Alias_TypeCode.h @@ -89,7 +89,6 @@ namespace TAO virtual CORBA::TypeCode_ptr content_type_i (void) const; private: - /// Base attributes for this @c TypeCode containing the /// repository ID and name of the @c typedef. Base_Attributes<StringType> attributes_; diff --git a/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.h index 4e77ae9616a..0d58e9a48df 100644 --- a/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.h +++ b/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.h @@ -92,7 +92,6 @@ namespace TAO virtual CORBA::TypeCode_ptr content_type_i (void) const; private: - /// Base attributes for this @c TypeCode containing the /// repository ID and name of the @c typedef. Base_Attributes<char const *> attributes_; diff --git a/TAO/tao/AnyTypeCode/Enum_TypeCode.h b/TAO/tao/AnyTypeCode/Enum_TypeCode.h index 43d3994b0ea..92138dd513c 100644 --- a/TAO/tao/AnyTypeCode/Enum_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Enum_TypeCode.h @@ -87,7 +87,6 @@ namespace TAO //@} private: - /** * @c Enum Attributes * diff --git a/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.h index 895b31af85c..765dcea63f3 100644 --- a/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.h +++ b/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.h @@ -93,7 +93,6 @@ namespace TAO //@} private: - /** * @c Enum Attributes * diff --git a/TAO/tao/AnyTypeCode/Fixed_TypeCode.h b/TAO/tao/AnyTypeCode/Fixed_TypeCode.h index 1d6db07abd4..546d06671b7 100644 --- a/TAO/tao/AnyTypeCode/Fixed_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Fixed_TypeCode.h @@ -79,15 +79,12 @@ namespace TAO virtual CORBA::UShort fixed_scale_i (void) const; private: - /// The number of significant digits. CORBA::UShort const digits_; /// The scale factor. CORBA::UShort const scale_; - }; - } // End namespace TypeCode } // End namespace TAO diff --git a/TAO/tao/AnyTypeCode/Indirected_Type_TypeCode.h b/TAO/tao/AnyTypeCode/Indirected_Type_TypeCode.h index 08dfe756b7f..fb5e89e8264 100644 --- a/TAO/tao/AnyTypeCode/Indirected_Type_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Indirected_Type_TypeCode.h @@ -121,7 +121,6 @@ namespace TAO //@} private: - //@{ /// Typecode id @@ -137,9 +136,7 @@ namespace TAO unsigned long refcount_; //@} - }; - } // End namespace TypeCode } // End namespace TAO diff --git a/TAO/tao/AnyTypeCode/NVList.h b/TAO/tao/AnyTypeCode/NVList.h index e68f65402bf..001a1d7691d 100644 --- a/TAO/tao/AnyTypeCode/NVList.h +++ b/TAO/tao/AnyTypeCode/NVList.h @@ -106,7 +106,6 @@ namespace CORBA typedef NamedValue_out _out_type; protected: - /// Destructor /** * Protected destructor to enforce proper memory management @@ -115,13 +114,11 @@ namespace CORBA ~NamedValue (void); private: - /// private constructor. Cannot be directly instantiated other than /// by its friends. NamedValue (void); private: - /// Reference counter. #if defined (ACE_HAS_CPP11) std::atomic<uint32_t> refcount_; @@ -241,7 +238,6 @@ namespace CORBA typedef NVList_out _out_type; protected: - /// Destructor /** * Protected destructor to enforce proper memory management diff --git a/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h b/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h index 8036eb2c939..eb412bc15f2 100644 --- a/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h @@ -133,7 +133,6 @@ namespace TAO CORBA::ULong nfields); private: - /** * @class Reset * @@ -151,7 +150,6 @@ namespace TAO }; private: - /// Internal state thread synchronization mutex. mutable TAO_SYNCH_RECURSIVE_MUTEX lock_; diff --git a/TAO/tao/AnyTypeCode/Sequence_TypeCode.h b/TAO/tao/AnyTypeCode/Sequence_TypeCode.h index 629dbb309cf..5b69724dd4a 100644 --- a/TAO/tao/AnyTypeCode/Sequence_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Sequence_TypeCode.h @@ -82,7 +82,6 @@ namespace TAO virtual CORBA::TypeCode_ptr content_type_i (void) const; private: - /// Element type of the sequence. /** * A pointer to the @c CORBA::TypeCode_ptr rather than the @@ -99,9 +98,7 @@ namespace TAO /// Length of the @c sequence or array. A length of zero /// indicates an unbounded @c sequence. CORBA::ULong const length_; - }; - } // End namespace TypeCode } // End namespace TAO diff --git a/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.h index 28d92a55209..da324532490 100644 --- a/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.h +++ b/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.h @@ -87,7 +87,6 @@ namespace TAO virtual CORBA::TypeCode_ptr content_type_i ( void) const; private: - /// Element type of the sequence. /** * A pointer to the @c CORBA::TypeCode_ptr rather than the @@ -104,9 +103,7 @@ namespace TAO /// Length of the @c sequence or array. A length of zero /// indicates an unbounded @c sequence. CORBA::ULong const length_; - }; - } // End namespace TypeCode } // End namespace TAO diff --git a/TAO/tao/AnyTypeCode/String_TypeCode.h b/TAO/tao/AnyTypeCode/String_TypeCode.h index 5c83294f862..06ad0ab4e2d 100644 --- a/TAO/tao/AnyTypeCode/String_TypeCode.h +++ b/TAO/tao/AnyTypeCode/String_TypeCode.h @@ -80,13 +80,10 @@ namespace TAO virtual CORBA::ULong length_i (void) const; private: - /// Length of the @c string. A length of zero indicates an /// unbounded @c string. CORBA::ULong const length_; - }; - } // End namespace TypeCode } // End namespace TAO diff --git a/TAO/tao/AnyTypeCode/String_TypeCode_Static.h b/TAO/tao/AnyTypeCode/String_TypeCode_Static.h index 0f70af74bc2..8fb262cb65d 100644 --- a/TAO/tao/AnyTypeCode/String_TypeCode_Static.h +++ b/TAO/tao/AnyTypeCode/String_TypeCode_Static.h @@ -67,7 +67,6 @@ namespace TAO //@} protected: - /** * @name @c TAO CORBA::TypeCode Template Methods * @@ -83,13 +82,10 @@ namespace TAO virtual CORBA::ULong length_i (void) const; private: - /// Length of the @c string. A length of zero indicates an /// unbounded @c string. CORBA::ULong const length_; - }; - } // End namespace TypeCode } // End namespace TAO diff --git a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.h index e97b6b40c6c..7e430252665 100644 --- a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.h +++ b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.h @@ -104,7 +104,6 @@ namespace TAO //@} private: - /** * @c Struct Attributes * @@ -128,9 +127,7 @@ namespace TAO /// OMG IDL defined @c struct. Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * const fields_; - //@} - }; } // End namespace TypeCode diff --git a/TAO/tao/AnyTypeCode/TypeCode.h b/TAO/tao/AnyTypeCode/TypeCode.h index 22d9e70516c..57320c5f79d 100644 --- a/TAO/tao/AnyTypeCode/TypeCode.h +++ b/TAO/tao/AnyTypeCode/TypeCode.h @@ -474,13 +474,11 @@ namespace CORBA //@} private: - // Prevent copying and assignment. TypeCode (TypeCode const &); void operator= (TypeCode const &); protected: - /// The kind of TypeCode. TCKind const kind_; diff --git a/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.h b/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.h index 8c0976fdd1b..1616339555c 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.h +++ b/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.h @@ -66,16 +66,13 @@ namespace TAO void name (char const * the_name); private: - /// The @c RepositoryId globally identifying the type. STRING_TYPE const id_; /// The simple name identifying the type within its enclosing /// scope. STRING_TYPE name_; - }; - } // End namespace TypeCode } // End namespace TAO diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h index ab7eedee33f..2e33c5a9413 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h +++ b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h @@ -130,7 +130,6 @@ namespace TAO CORBA::TypeCode_ptr tc) const = 0; private: - /// The name of the case. StringType name_; @@ -146,7 +145,6 @@ namespace TAO * @c Case. */ TypeCodeType type_; - }; typedef Case<CORBA::String_var, CORBA::TypeCode_var> Case_Dynamic; diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_T.h b/TAO/tao/AnyTypeCode/TypeCode_Case_T.h index fb96332372e..d6ab4a1ab36 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Case_T.h +++ b/TAO/tao/AnyTypeCode/TypeCode_Case_T.h @@ -116,12 +116,9 @@ namespace TAO //@} private: - /// IDL @c union case/member label value. DiscriminatorType const label_; - }; - } // End namespace TypeCode } // End namespace TAO diff --git a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.h index 33674648ea2..0ed2aa5a598 100644 --- a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.h +++ b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.h @@ -108,7 +108,6 @@ namespace TAO //@} private: - /** * @c Valuetype Attributes * diff --git a/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp b/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp index bc2a9361b56..bb568888c76 100644 --- a/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp +++ b/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp @@ -94,9 +94,9 @@ TAO_BiDirGIOP_Loader::load_policy_validators (TAO_Policy_Validator &val) // the same ORB (different POA). In cases where huge numbers of // bi-directional POA instances are created, having a validator // instance per POA may introduce additional delays in policy - // validation and hence, the overal policy creation time. Since this + // validation and hence, the overall policy creation time. Since this // is out of the critical invocation processing path, I plan to keep - // the design simple and not try to avoid an ineficiency of such + // the design simple and not try to avoid an inefficiency of such // small proportions. val.add_validator (validator); } diff --git a/TAO/tao/CDR.h b/TAO/tao/CDR.h index 3360714ffe4..87a5462f93e 100644 --- a/TAO/tao/CDR.h +++ b/TAO/tao/CDR.h @@ -240,13 +240,11 @@ public: int offset (char* pos); private: - // disallow copying... TAO_OutputCDR (const TAO_OutputCDR& rhs); TAO_OutputCDR& operator= (const TAO_OutputCDR& rhs); private: - /** * @name Outgoing GIOP Fragment Related Attributes * diff --git a/TAO/tao/CORBALOC_Parser.h b/TAO/tao/CORBALOC_Parser.h index 24c075f204e..9ce93163da0 100644 --- a/TAO/tao/CORBALOC_Parser.h +++ b/TAO/tao/CORBALOC_Parser.h @@ -59,7 +59,6 @@ public: CORBA::ORB_ptr orb); private: - /** * Make a stub from the MProfile that is created in * parse_string_mprofile_helper. Using this stub, create an object diff --git a/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.h b/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.h index a1b2f08b7ad..055654f0c90 100644 --- a/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.h +++ b/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.h @@ -77,7 +77,6 @@ namespace TAO void cancel(); private: - /// Create a deep copy of the request_ object. /// The other clone methods are used to support the TAO_ServerRequest clone. TAO_ServerRequest* clone (TAO_ServerRequest*& from); diff --git a/TAO/tao/CSD_Framework/CSD_POA.h b/TAO/tao/CSD_Framework/CSD_POA.h index 650c428dd96..c9ab1052c91 100644 --- a/TAO/tao/CSD_Framework/CSD_POA.h +++ b/TAO/tao/CSD_Framework/CSD_POA.h @@ -82,7 +82,6 @@ public: servant_dispatching_strategy_proxy (void) const; private: - TAO::CSD::Strategy_Proxy* sds_proxy_; }; diff --git a/TAO/tao/CSD_Framework/CSD_Strategy_Base.h b/TAO/tao/CSD_Framework/CSD_Strategy_Base.h index 98e8ed58280..879f86b08cd 100644 --- a/TAO/tao/CSD_Framework/CSD_Strategy_Base.h +++ b/TAO/tao/CSD_Framework/CSD_Strategy_Base.h @@ -114,7 +114,6 @@ namespace TAO const PortableServer::ObjectId& oid); private: - /// Only our friend, the proxy, is allowed to invoke our private operations. /// This allows us to not pollute the public interface of the CSD Strategy_Base /// subclasses with methods that should never be called (except by the diff --git a/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.h b/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.h index f78eb219ae3..2a96f39256d 100644 --- a/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.h +++ b/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.h @@ -88,7 +88,6 @@ namespace TAO const PortableServer::ObjectId& oid); private: - /// Smart Pointer to a custom servant dispatching strategy object. /// This smart pointer will be in the "nil" state when the "default" /// strategy is to be applied. diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.h index 3fce35f1871..3fd5f1d7be0 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.h +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.h @@ -65,7 +65,6 @@ namespace TAO virtual bool visit_request(TP_Request* request, bool& remove_flag); private: - /// Left as nil if we are to cancel all requests, or set to a specific /// servant if only requests targeting that servant should be cancelled. PortableServer::ServantBase_var servant_; diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.h index db5bafb10e3..b83f2d2b891 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.h +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.h @@ -83,7 +83,6 @@ namespace TAO private: - /// Helper used to block and unblock the thread that invokes our /// wait() method. TP_Synch_Helper synch_helper_; diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.h index 017d5dcc127..6f26c09614b 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.h +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.h @@ -88,7 +88,6 @@ namespace TAO private: - /// Helper used to block and unblock the thread that invokes our /// wait() method. TP_Synch_Helper synch_helper_; diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request.h index 3e9498cece7..0275dd4cd7e 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request.h +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request.h @@ -51,7 +51,6 @@ namespace TAO protected: - /// Constructor. TP_Custom_Request(TP_Custom_Request_Operation* op, TP_Servant_State* servant_state); @@ -61,7 +60,6 @@ namespace TAO private: - TP_Custom_Request_Operation_Handle op_; }; diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.h index c838d12b0c0..4ed3509efe7 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.h +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.h @@ -70,7 +70,6 @@ namespace TAO protected: - /// Constructor. TP_Custom_Request_Operation(PortableServer::Servant servant); @@ -79,7 +78,6 @@ namespace TAO private: - PortableServer::ServantBase_var servant_; }; diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.h index 94d98d3f44d..f6bffc898eb 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.h +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.h @@ -45,7 +45,6 @@ namespace TAO class TAO_CSD_TP_Export TP_Custom_Synch_Request : public TP_Custom_Request { public: - /// Constructor. TP_Custom_Synch_Request(TP_Custom_Request_Operation* op, TP_Servant_State* servant_state); @@ -59,23 +58,18 @@ namespace TAO /// been cancelled. bool wait(); - protected: - /// Dispatch the request to the servant. virtual void dispatch_i(); /// Cancel the request. virtual void cancel_i(); - private: - /// Helper used to block and unblock the thread that invokes our /// wait() method. TP_Synch_Helper synch_helper_; }; - } } diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.h index 1359d2ef988..76a6b97669a 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.h +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.h @@ -49,7 +49,6 @@ namespace TAO class TAO_CSD_TP_Export TP_Dispatchable_Visitor : public TP_Queue_Visitor { public: - /// Default Constructor. TP_Dispatchable_Visitor(); @@ -57,7 +56,7 @@ namespace TAO virtual ~TP_Dispatchable_Visitor(); /// Reset this visitor object in order to re-use it for another - /// visitation of the request queue. This sets the vistor's "result" + /// visitation of the request queue. This sets the visitor's "result" /// (the TP_Request* data member) to its default value (a nil handle). void reset(); @@ -73,11 +72,9 @@ namespace TAO private: - /// A handle to the located request. TP_Request_Handle request_; }; - } } diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Queue.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Queue.h index 7799e0247ad..9066d0a0d77 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Queue.h +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Queue.h @@ -58,7 +58,6 @@ namespace TAO class TAO_CSD_TP_Export TP_Queue { public: - /// Default Constructor. TP_Queue(); @@ -77,14 +76,12 @@ namespace TAO void accept_visitor(TP_Queue_Visitor& visitor); private: - /// The request at the front of the queue. TP_Request* head_; /// The request at the end of the queue. TP_Request* tail_; }; - } } diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Request.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Request.h index c54fc546374..8a6ffc63e02 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Request.h +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Request.h @@ -100,9 +100,7 @@ namespace TAO /// Ask the subclass to perform its duties to carry out the cancellation. virtual void cancel_i() = 0; - private: - /// The TP_Queue class is our friend since it needs access to /// the prev_ and next_ (private) data members. friend class TP_Queue; diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State.h index 3303b66db86..0b16cea7c4c 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State.h +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State.h @@ -55,7 +55,6 @@ namespace TAO : public TAO_Intrusive_Ref_Count_Base<TAO_SYNCH_MUTEX> { public: - /// Handle Type (aka, Smart Pointer Type). typedef TAO_Intrusive_Ref_Count_Handle<TP_Servant_State> HandleType; @@ -72,7 +71,6 @@ namespace TAO void busy_flag(bool new_value); private: - /// The servant's current "busy" state (true == busy, false == not busy) bool busy_flag_; }; diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.h index 7057a1a3280..d78e196d0db 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.h +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.h @@ -45,7 +45,6 @@ namespace TAO class TAO_CSD_TP_Export TP_Servant_State_Map { public: - /// Default Constructor. TP_Servant_State_Map(); @@ -53,20 +52,15 @@ namespace TAO ~TP_Servant_State_Map(); /// Accessor for the servant busy flag. - TP_Servant_State* find(PortableServer::Servant servant - ); + TP_Servant_State* find(PortableServer::Servant servant); /// Insert the servant to map. - void insert(PortableServer::Servant servant - ); + void insert(PortableServer::Servant servant); /// Remove the servant from map. - void remove(PortableServer::Servant servant - ); - + void remove(PortableServer::Servant servant); private: - /// Underlying Map Type - Hash-Based - /// Key Type: void*, Value Type: TP_Servant_State::HandleType typedef ACE_Hash_Map_Manager_Ex<void*, diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.h index 6764927943a..8c540e5a588 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.h +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.h @@ -148,7 +148,6 @@ namespace TAO const PortableServer::ObjectId& oid); private: - /** * Helper method that is responsible for looking up the servant * state object in the servant state map *if* the "serialize diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.h index 14bf8da3864..73597bdd60f 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.h +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.h @@ -65,7 +65,6 @@ namespace TAO private: - /// Enumeration Type for all possible states of this helper object. enum HelperState { diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Task.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Task.h index 76d1004946d..1365350c168 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Task.h +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Task.h @@ -103,7 +103,6 @@ namespace TAO void cancel_servant (PortableServer::Servant servant); private: - typedef TAO_SYNCH_MUTEX LockType; typedef TAO_Condition<LockType> ConditionType; diff --git a/TAO/tao/Collocated_Invocation.h b/TAO/tao/Collocated_Invocation.h index 09074829782..41dfc3b23ac 100644 --- a/TAO/tao/Collocated_Invocation.h +++ b/TAO/tao/Collocated_Invocation.h @@ -83,10 +83,8 @@ namespace TAO Invocation_Status invoke (Collocation_Strategy strat); private: - // Disallow default construction. Collocated_Invocation (void); - }; } diff --git a/TAO/tao/Connector_Impl.h b/TAO/tao/Connector_Impl.h index 1faf98d70ee..e220cb83212 100644 --- a/TAO/tao/Connector_Impl.h +++ b/TAO/tao/Connector_Impl.h @@ -44,7 +44,6 @@ template <class SVC_HANDLER> class TAO_Connect_Creation_Strategy : public ACE_Creation_Strategy<SVC_HANDLER> { public: - /// Constructor. TAO_Connect_Creation_Strategy (ACE_Thread_Manager * = 0, TAO_ORB_Core* orb_core = 0); @@ -54,7 +53,6 @@ public: private: - /// Pointer to the ORB_Core on which we are activated TAO_ORB_Core * const orb_core_; }; @@ -75,7 +73,6 @@ class TAO_Connect_Concurrency_Strategy : public ACE_Concurrency_Strategy<SVC_HANDLER> { public: - /// Constructor. TAO_Connect_Concurrency_Strategy (TAO_ORB_Core *orb_core); @@ -85,7 +82,6 @@ public: int activate_svc_handler (SVC_HANDLER *svc_handler, void *arg); private: - /// Pointer to the ORB Core. TAO_ORB_Core * const orb_core_; }; diff --git a/TAO/tao/Default_Endpoint_Selector_Factory.h b/TAO/tao/Default_Endpoint_Selector_Factory.h index f050cb771cb..e460006dc2b 100644 --- a/TAO/tao/Default_Endpoint_Selector_Factory.h +++ b/TAO/tao/Default_Endpoint_Selector_Factory.h @@ -62,13 +62,11 @@ public: virtual TAO_Invocation_Endpoint_Selector *get_selector (void); private: - // Prevent copying/assignment. TAO_Default_Endpoint_Selector_Factory (TAO_Default_Endpoint_Selector_Factory const &); void operator= (TAO_Default_Endpoint_Selector_Factory const &); protected: - /// The possible endpoint selector strategies that can be /// returned by this factory TAO_Default_Endpoint_Selector * const default_endpoint_selector_; diff --git a/TAO/tao/Default_Thread_Lane_Resources_Manager.h b/TAO/tao/Default_Thread_Lane_Resources_Manager.h index 37ed5a68929..5df53e6209e 100644 --- a/TAO/tao/Default_Thread_Lane_Resources_Manager.h +++ b/TAO/tao/Default_Thread_Lane_Resources_Manager.h @@ -67,12 +67,10 @@ public: // @} private: - TAO_Default_Thread_Lane_Resources_Manager (TAO_Default_Thread_Lane_Resources_Manager const &); void operator= (TAO_Default_Thread_Lane_Resources_Manager const &); protected: - /// Default lane resources. TAO_Thread_Lane_Resources * const lane_resources_; diff --git a/TAO/tao/DiffServPolicy/DiffServPolicy_ORBInitializer.h b/TAO/tao/DiffServPolicy/DiffServPolicy_ORBInitializer.h index b99cf2d340b..cf3dd677fc1 100644 --- a/TAO/tao/DiffServPolicy/DiffServPolicy_ORBInitializer.h +++ b/TAO/tao/DiffServPolicy/DiffServPolicy_ORBInitializer.h @@ -44,7 +44,6 @@ public: virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); private: - /// Register DiffServ policy factories. void register_policy_factories (PortableInterceptor::ORBInitInfo_ptr info); diff --git a/TAO/tao/DiffServPolicy/Server_Network_Priority_Policy.h b/TAO/tao/DiffServPolicy/Server_Network_Priority_Policy.h index 80e3a7498ac..41e22e0e1e7 100644 --- a/TAO/tao/DiffServPolicy/Server_Network_Priority_Policy.h +++ b/TAO/tao/DiffServPolicy/Server_Network_Priority_Policy.h @@ -94,7 +94,6 @@ public: CORBA::Boolean _tao_decode (TAO_InputCDR &in_cdr); protected: - virtual ~TAO_Server_Network_Priority_Policy (void); private: diff --git a/TAO/tao/DynamicAny/DynCommon.h b/TAO/tao/DynamicAny/DynCommon.h index 52af822228b..4d8da9d2790 100644 --- a/TAO/tao/DynamicAny/DynCommon.h +++ b/TAO/tao/DynamicAny/DynCommon.h @@ -248,7 +248,6 @@ protected: private: // Utility functions used by insert_* and get_*. - CORBA::TypeCode_ptr check_type_and_unalias (CORBA::TypeCode_ptr tc); }; diff --git a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.h b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.h index f06a07b7a62..43e5e098114 100644 --- a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.h +++ b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.h @@ -116,7 +116,6 @@ namespace TAO TAO::Exception_Data *ex_data_; private: - /// Dont allow default initializations DII_Invocation_Adapter (void); diff --git a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp index 018c2e4a5cd..d36706cacf9 100644 --- a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp +++ b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp @@ -48,7 +48,7 @@ TAO_DII_Deferred_Reply_Dispatcher::dispatch_reply ( } // See whether we need to delete the data block by checking the - // flags. We cannot be happy that we initally allocated the + // flags. We cannot be happy that we initially allocated the // datablocks of the stack. If this method is called twice, as is in // some cases where the same invocation object is used to make two // invocations like forwarding, the release becomes essential. diff --git a/TAO/tao/DynamicInterface/Dynamic_Implementation.h b/TAO/tao/DynamicInterface/Dynamic_Implementation.h index 2a20f7cbafe..cff817fd412 100644 --- a/TAO/tao/DynamicInterface/Dynamic_Implementation.h +++ b/TAO/tao/DynamicInterface/Dynamic_Implementation.h @@ -71,7 +71,6 @@ public: virtual CORBA::InterfaceDef_ptr _get_interface (void); protected: - /// Return 0. Should never be used. virtual const char *_interface_repository_id (void) const; diff --git a/TAO/tests/Connection_Failure/README b/TAO/tests/Connection_Failure/README index 74e7df40d0d..7ae5b95d45d 100644 --- a/TAO/tests/Connection_Failure/README +++ b/TAO/tests/Connection_Failure/README @@ -1,7 +1,5 @@ /** - - @page Connection_Failure Test README File A simple test for connection failures. The client tries to connect to diff --git a/TAO/tests/Crashed_Callback/README b/TAO/tests/Crashed_Callback/README index ee6379a44c1..93dd4a401fa 100644 --- a/TAO/tests/Crashed_Callback/README +++ b/TAO/tests/Crashed_Callback/README @@ -1,17 +1,15 @@ /** - - @page Crashed Callback Test README File - On TAO-1.1.12 the ORB would dead-lock when trying to send a +On TAO-1.1.12 the ORB would dead-lock when trying to send a callback to a crashed server. As far as we know it only happens with reliable oneways. - To run the test use the run_test.pl script: +To run the test use the run_test.pl script: $ ./run_test.pl - the script returns 0 if the test was successful. +the script returns 0 if the test was successful. */ |