diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | TAO/tao/Default_Collocation_Resolver.h | 2 | ||||
| -rw-r--r-- | TAO/tao/Invocation_Base.h | 12 | ||||
| -rw-r--r-- | TAO/tao/ObjectKey_Table.h | 8 | ||||
| -rw-r--r-- | TAO/tao/Object_Proxy_Impl.h | 2 | ||||
| -rw-r--r-- | TAO/tao/Parser_Registry.h | 2 | ||||
| -rw-r--r-- | TAO/tao/objectid.h | 4 | ||||
| -rw-r--r-- | TAO/tao/tao.mpc | 9 | ||||
| -rw-r--r-- | TAO/tao/target_specification.h | 2 |
9 files changed, 29 insertions, 17 deletions
diff --git a/ChangeLog b/ChangeLog index c312d1e56f3..44098a7f583 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Apr 12 13:51:42 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/ace.mpc: + Removed default part from the Template_Files, it is not needed. + Mon Apr 12 13:39:12 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl> * ace/config-win32-common.h: diff --git a/TAO/tao/Default_Collocation_Resolver.h b/TAO/tao/Default_Collocation_Resolver.h index 2998ce75bd6..54d6e096d6d 100644 --- a/TAO/tao/Default_Collocation_Resolver.h +++ b/TAO/tao/Default_Collocation_Resolver.h @@ -38,7 +38,7 @@ class TAO_Export TAO_Default_Collocation_Resolver : { public: - /// Is <object> collocated? + /// Is @a object collocated? virtual CORBA::Boolean is_collocated (CORBA::Object_ptr object ACE_ENV_ARG_DECL) const; }; diff --git a/TAO/tao/Invocation_Base.h b/TAO/tao/Invocation_Base.h index 95b61f9cbdd..dccb182f438 100644 --- a/TAO/tao/Invocation_Base.h +++ b/TAO/tao/Invocation_Base.h @@ -50,7 +50,7 @@ namespace TAO * * This class is the base of the invocation object hiererachy. This * hierarchy is classified based on the type of invocation and the - * mode of invocation. One of the objects from the hiererachy is + * mode of invocation. One of the objects from the hierarchy is * created on the stack for every invocation. * * In addition this class encapsulates the essential details that @@ -113,15 +113,15 @@ namespace TAO protected: /** - * @param otarget, The original target on which this invocation + * @param otarget The original target on which this invocation * was started. * - * @param target, the target on which this invocation is flowing + * @param target the target on which this invocation is flowing * ie. the effective target * - * @param op, operation details of the invocation on @a target + * @param op operation details of the invocation on @a target * - * @param response_Expected, flag to indicate whether the + * @param response_expected flag to indicate whether the * operation encapsulated by @a op returns a response or not. */ Invocation_Base (CORBA::Object_ptr otarget, @@ -181,7 +181,7 @@ namespace TAO virtual Dynamic::ParameterList *arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - /// Return the list of exceptions declared as a ExceptionList + /// Return the list of exceptions declared as a ExceptionList Dynamic::ExceptionList *exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); diff --git a/TAO/tao/ObjectKey_Table.h b/TAO/tao/ObjectKey_Table.h index 4b418a9fa29..db3027c7d05 100644 --- a/TAO/tao/ObjectKey_Table.h +++ b/TAO/tao/ObjectKey_Table.h @@ -35,9 +35,9 @@ namespace TAO class ObjectKey; /** - * @class ObjectKey_Table + * @class Less_Than_ObjectKey * - * @brief: Compares the length and then the contents of ObjectKeys. + * @brief Compares the length and then the contents of ObjectKeys. * * Should have been a specialization of the functor * ACE_Less_Than<sequence<CORBA::Octet>>. But that will not work @@ -69,13 +69,13 @@ namespace TAO * to bind () will return a pointer which is expected to be cached * by the client/caller and use the pointer in every invocation. * - * @NOTE: This class uses the ACE_RB_Tree to maintain the table of + * @note This class uses the ACE_RB_Tree to maintain the table of * ObjectKeys. The RB_Tree has good insertion and lookup * properties. Its Iteration properties are not that good, but we * dont need to do much iteration unless we are closing down the * table. * - * @NOTE: The reasons to use RB_Tree are its good dynamic + * @note The reasons to use RB_Tree are its good dynamic * properties. We should try to strategize the class to use either a * Hash_Map or a RB_Tree based on some runtime option. For that we * need an adapter class in ACE, like an ACE_Lock_Adapter class. We diff --git a/TAO/tao/Object_Proxy_Impl.h b/TAO/tao/Object_Proxy_Impl.h index 27ada619c99..5b80dc288f7 100644 --- a/TAO/tao/Object_Proxy_Impl.h +++ b/TAO/tao/Object_Proxy_Impl.h @@ -7,7 +7,7 @@ * $Id$ * * This files contains the proxy definition of the interface that - * all the Object proxy have to imlements. + * all the Object proxy have to implement. * * @author Angelo Corsaro <corsaro@cs.wustl.edu> */ diff --git a/TAO/tao/Parser_Registry.h b/TAO/tao/Parser_Registry.h index c0d7409db7a..13571c9bd2b 100644 --- a/TAO/tao/Parser_Registry.h +++ b/TAO/tao/Parser_Registry.h @@ -52,7 +52,7 @@ public: /// Invoked by the ORB during startup. int open (TAO_ORB_Core *orb_core); - /// Find the parser that can parse <ior_string> + /// Find the parser that can parse @a ior_string /// The lookup is based on the prefix in the string TAO_IOR_Parser *match_parser (const char *ior_string); diff --git a/TAO/tao/objectid.h b/TAO/tao/objectid.h index 52d09cfc7f5..769479ac407 100644 --- a/TAO/tao/objectid.h +++ b/TAO/tao/objectid.h @@ -87,7 +87,7 @@ // above list once the above services register their references // dynamically. -// Service IDs for the services that are located through Multicast. +/// Service IDs for the services that are located through Multicast. enum TAO_MCAST_SERVICEID { NAMESERVICE, @@ -96,7 +96,7 @@ enum TAO_MCAST_SERVICEID INTERFACEREPOSERVICE }; -// No. of services locatable through multicast. +/// No. of services locatable through multicast. #define TAO_NO_OF_MCAST_SERVICES 4 diff --git a/TAO/tao/tao.mpc b/TAO/tao/tao.mpc index faa0c361875..7a55f973e70 100644 --- a/TAO/tao/tao.mpc +++ b/TAO/tao/tao.mpc @@ -267,7 +267,7 @@ project(TAO) : acelib, taoversion, core, tao_output, taodefaults, extra_core { Special_Basic_Arguments.cpp } } - + Header_Files { Arg_Traits_T.h CONV_FRAMES.h @@ -286,4 +286,11 @@ project(TAO) : acelib, taoversion, core, tao_output, taodefaults, extra_core { UShortSeqS.h ULongSeqS.h } + + Template_Files { + TAO_Singleton.cpp + Condition.cpp + orb.idl + Auto_Functor.cpp + } } diff --git a/TAO/tao/target_specification.h b/TAO/tao/target_specification.h index ffc8a8feba6..4a352a6b333 100644 --- a/TAO/tao/target_specification.h +++ b/TAO/tao/target_specification.h @@ -112,13 +112,13 @@ public: TAO_Target_Address specifier (void); private: + /// The union of all the possibilities union { TAO::ObjectKey *object_key_; IOP::TaggedProfile *profile_; IOP::IOR *ior_; } u_; - // The union of all the possibilities /// The enum identifier TAO_Target_Address specifier_; |