summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--TAO/tao/PortableServer/AMH_Response_Handler.h2
-rw-r--r--TAO/tao/PortableServer/Default_Acceptor_Filter.h2
-rw-r--r--TAO/tao/PortableServer/POA.h6
-rw-r--r--TAO/tao/PortableServer/Servant_Base.cpp2
-rw-r--r--TAO/tao/PortableServer/ServerInterceptorAdapter.h2
-rw-r--r--TAO/tao/PortableServer/ServerRequestInfo.h2
6 files changed, 8 insertions, 8 deletions
diff --git a/TAO/tao/PortableServer/AMH_Response_Handler.h b/TAO/tao/PortableServer/AMH_Response_Handler.h
index c86b86f1113..deb0b93ebaa 100644
--- a/TAO/tao/PortableServer/AMH_Response_Handler.h
+++ b/TAO/tao/PortableServer/AMH_Response_Handler.h
@@ -79,7 +79,7 @@ public:
protected:
- /// Sets up the various paramters in anticipation of returning a reply
+ /// Sets up the various parameters in anticipation of returning a reply
/// to the client. return/OUT/INOUT arguments are marshalled into the
/// Output stream after this method has been called.
void _tao_rh_init_reply (ACE_ENV_SINGLE_ARG_DECL);
diff --git a/TAO/tao/PortableServer/Default_Acceptor_Filter.h b/TAO/tao/PortableServer/Default_Acceptor_Filter.h
index dc8187f0bb1..9e7bf2e1bf5 100644
--- a/TAO/tao/PortableServer/Default_Acceptor_Filter.h
+++ b/TAO/tao/PortableServer/Default_Acceptor_Filter.h
@@ -49,7 +49,7 @@ class TAO_PortableServer_Export TAO_Default_Acceptor_Filter : public TAO_Accepto
public:
TAO_Default_Acceptor_Filter (void);
- /// Populate <mprofile> with all available endpoints.
+ /// Populate @a mprofile with all available endpoints.
int fill_profile (const TAO::ObjectKey &object_key,
TAO_MProfile &mprofile,
TAO_Acceptor **acceptors_begin,
diff --git a/TAO/tao/PortableServer/POA.h b/TAO/tao/PortableServer/POA.h
index 086ac65aa62..a3c7f13b7b6 100644
--- a/TAO/tao/PortableServer/POA.h
+++ b/TAO/tao/PortableServer/POA.h
@@ -514,8 +514,8 @@ public:
ACE_ENV_ARG_DECL
);
+ /// ORB Core for POA.
TAO_ORB_Core &orb_core (void) const;
- // ORB Core for POA.
CORBA::Boolean cleanup_in_progress (void);
@@ -538,7 +538,7 @@ public:
/// Accessor for the current thread policy of this POA.
PortableServer::ThreadPolicyValue thread_policy (void) const;
- ///Accessor methods to POA state.
+ /// Accessor methods to POA state.
/**
* The POA can be in one of HOLDING, ACTIVE, DISCARDING, INACTIVE
* and NON_EXISTENT states.
@@ -1068,8 +1068,8 @@ public:
protected:
+ /// POA Manager
PortableServer::POAManager_var poa_manager_;
- // POA Manager
};
#endif /* TAO_HAS_MINIMUM_POA == 0 */
diff --git a/TAO/tao/PortableServer/Servant_Base.cpp b/TAO/tao/PortableServer/Servant_Base.cpp
index 8ed151c3e00..ff320d9ee3c 100644
--- a/TAO/tao/PortableServer/Servant_Base.cpp
+++ b/TAO/tao/PortableServer/Servant_Base.cpp
@@ -302,7 +302,7 @@ void TAO_ServantBase::asynchronous_upcall_dispatch (TAO_ServerRequest &req,
// send if it is expected and it has not already been sent
// Return immediately. Do not send a reply; this is an
- // asunchronous upcall. (unless, of course there is a system
+ // asynchronous upcall. (unless, of course there is a system
// exception.
}
diff --git a/TAO/tao/PortableServer/ServerInterceptorAdapter.h b/TAO/tao/PortableServer/ServerInterceptorAdapter.h
index 1fea6879a6a..9d918cb6611 100644
--- a/TAO/tao/PortableServer/ServerInterceptorAdapter.h
+++ b/TAO/tao/PortableServer/ServerInterceptorAdapter.h
@@ -65,8 +65,8 @@ public:
* The "receive_request_service_contexts()" and "send_other()"
* PortableInterceptor interception points are missing.
*/
-#if TAO_HAS_EXTENDED_FT_INTERCEPTORS == 1
//@{
+#if TAO_HAS_EXTENDED_FT_INTERCEPTORS == 1
/// This method implements the "starting" server side interception
/// point. It will be used as the first interception point and it is
/// proprietary to TAO.
diff --git a/TAO/tao/PortableServer/ServerRequestInfo.h b/TAO/tao/PortableServer/ServerRequestInfo.h
index df72a6f7163..7b78ccd404d 100644
--- a/TAO/tao/PortableServer/ServerRequestInfo.h
+++ b/TAO/tao/PortableServer/ServerRequestInfo.h
@@ -93,7 +93,7 @@ public:
ACE_THROW_SPEC ((CORBA::SystemException));
/// Return the result of the current request. If there is no return
- /// value then an Any with tk_void TypeCode is returned. This is
+ /// value then an Any with tk_void TypeCode is returned. This
/// method is not valid for oneway operations.
virtual CORBA::Any * result (
ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)