summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--TAO/tao/Makefile.am1
-rw-r--r--TAO/tao/Pluggable_Messaging.cpp8
-rw-r--r--TAO/tao/Pluggable_Messaging.h4
-rw-r--r--TAO/tao/Pluggable_Messaging.i3
-rw-r--r--TAO/tao/Pluggable_Messaging_Utils.h56
-rw-r--r--TAO/tao/PolicyFactory_Registry.h2
-rw-r--r--TAO/tao/Policy_Set.h1
-rw-r--r--TAO/tao/Profile.cpp23
-rw-r--r--TAO/tao/Pseudo_VarOut_T.h2
9 files changed, 41 insertions, 59 deletions
diff --git a/TAO/tao/Makefile.am b/TAO/tao/Makefile.am
index fe8188db3f9..62d2ea7e483 100644
--- a/TAO/tao/Makefile.am
+++ b/TAO/tao/Makefile.am
@@ -786,7 +786,6 @@ nobase_include_HEADERS += \
PI_ForwardC.inl \
ParameterModeC.inl \
Parser_Registry.i \
- Pluggable_Messaging.i \
Pluggable_Messaging_Utils.i \
PolicyC.inl \
Policy_ForwardC.i \
diff --git a/TAO/tao/Pluggable_Messaging.cpp b/TAO/tao/Pluggable_Messaging.cpp
index 0b5ca334c38..c63880b3fa4 100644
--- a/TAO/tao/Pluggable_Messaging.cpp
+++ b/TAO/tao/Pluggable_Messaging.cpp
@@ -2,12 +2,8 @@
#include "Pluggable_Messaging.h"
-#if !defined (__ACE_INLINE__)
-# include "tao/Pluggable_Messaging.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (tao,
- Pluggable_Messaging,
+ACE_RCSID (tao,
+ Pluggable_Messaging,
"$Id$")
TAO_Pluggable_Messaging::~TAO_Pluggable_Messaging (void)
diff --git a/TAO/tao/Pluggable_Messaging.h b/TAO/tao/Pluggable_Messaging.h
index c47d1101c9d..c2f04e0c9c4 100644
--- a/TAO/tao/Pluggable_Messaging.h
+++ b/TAO/tao/Pluggable_Messaging.h
@@ -178,10 +178,6 @@ public:
virtual TAO_OutputCDR &out_stream (void) = 0;
};
-#if defined (__ACE_INLINE__)
-# include "tao/Pluggable_Messaging.i"
-#endif /* __ACE_INLINE__ */
-
#include /**/ "ace/post.h"
#endif /*TAO_PLUGGABLE_MESSAGING_H*/
diff --git a/TAO/tao/Pluggable_Messaging.i b/TAO/tao/Pluggable_Messaging.i
deleted file mode 100644
index d770714e772..00000000000
--- a/TAO/tao/Pluggable_Messaging.i
+++ /dev/null
@@ -1,3 +0,0 @@
-// -*- C++ -*-
-
-//$Id$
diff --git a/TAO/tao/Pluggable_Messaging_Utils.h b/TAO/tao/Pluggable_Messaging_Utils.h
index d85c44770bd..9a7b421ecbf 100644
--- a/TAO/tao/Pluggable_Messaging_Utils.h
+++ b/TAO/tao/Pluggable_Messaging_Utils.h
@@ -118,29 +118,28 @@ public:
// keeping off. I dont want to add something for the kick of it :-)
enum TAO_Pluggable_Header_Type
{
- // = TITLE
- // = DESCRIPTION
- //
TAO_PLUGGABLE_MESSAGE_REQUEST_HEADER = 0,
TAO_PLUGGABLE_MESSAGE_LOCATE_REQUEST_HEADER
};
+/**
+ * Provide an external interface for the users of this pluggable
+ * messaging framework to denote existing message types. This has
+ * an inspiration from GIOP. So if anybody wants to add more message
+ * types you are welcome but please do not change the numbering
+ * scheme as this would affect GIOP.
+ *
+ * @note
+ * We may not need everything here. It would be good if we
+ * have only the following messages TAO_PLUGGABLE_MESSAGE_REQUEST,
+ * TAO_PLUGGABLE_MESSAGE_REPLY,
+ * TAO_PLUGGABLE_MESSAGE_CLOSECONNECTION,
+ * TAO_PLUGGABLE_MESSAGE_MESSAGE_ERROR. Changes will be made once
+ * the rest of the stuff gets ready to roll
+ */
enum TAO_Pluggable_Message_Type
{
- // = DESCRIPTION
- // Provide an external interface for the users of this pluggable
- // messaging framework to denote existing message types. This has
- // an inspiration from GIOP. So if anybody wants to add more message
- // types you are welcome but please do not change the numbering
- // scheme as this would affect GIOP.
-
- // NOTE: We may not need evrything here. It would be good if we
- // have only the following messages TAO_PLUGGABLE_MESSAGE_REQUEST,
- // TAO_PLUGGABLE_MESSAGE_REPLY,
- // TAO_PLUGGABLE_MESSAGE_CLOSECONNECTION,
- // TAO_PLUGGABLE_MESSAGE_MESSAGE_ERROR. Changes will be made once
- // the rest of the stuff gets ready to roll.
TAO_PLUGGABLE_MESSAGE_REQUEST = 0, // sent by client.
TAO_PLUGGABLE_MESSAGE_REPLY = 1, // by server.
TAO_PLUGGABLE_MESSAGE_CANCELREQUEST = 2, // by client.
@@ -154,31 +153,32 @@ enum TAO_Pluggable_Message_Type
// @@ Bala: This is a hopeless GIOPism.
// @@ Carlos: Agreed.
+/**
+ * Provide an external interface for the users of this pluggable
+ * messaging framework to denote existing Exception types. This has
+ * an inspiration from GIOP. So if anybody wants to add more message
+ * types you are welcome but please do not change the numbering
+ * scheme as this would affect GIOP.
+ */
enum TAO_Pluggable_Message_Exception_Type
{
- // = DESCRIPTION
- // Provide an external interface for the users of this pluggable
- // messaging framework to denote existing Exception types. This has
- // an inspiration from GIOP. So if anybody wants to add more message
- // types you are welcome but please do not change the numbering
- // scheme as this would affect GIOP.
+ /// Request completed successfully
TAO_PLUGGABLE_MESSAGE_NO_EXCEPTION = 0,
- // Request completed successfully
+ /// Request terminated with user exception
TAO_PLUGGABLE_MESSAGE_USER_EXCEPTION,
- // Request terminated with user exception
+ /// Request terminated with system exception
TAO_PLUGGABLE_MESSAGE_SYSTEM_EXCEPTION,
- // Request terminated with system exception
+ /// Reply is a location forward type
TAO_PLUGGABLE_MESSAGE_LOCATION_FORWARD,
- // Reply is a location forward type
+ /// PLUGGABLE_MESSAGE 1.2, Reply is a location forward perm type..
TAO_PLUGGABLE_MESSAGE_LOCATION_FORWARD_PERM,
- // PLUGGABLE_MESSAGE 1.2, Reply is a location forward perm type..
+ /// GIOP1.2,
TAO_PLUGGABLE_MESSAGE_NEEDS_ADDRESSING_MODE
- // GIOP1.2,
};
#if defined (__ACE_INLINE__)
diff --git a/TAO/tao/PolicyFactory_Registry.h b/TAO/tao/PolicyFactory_Registry.h
index 1bd5151fd55..4ca44e31975 100644
--- a/TAO/tao/PolicyFactory_Registry.h
+++ b/TAO/tao/PolicyFactory_Registry.h
@@ -91,7 +91,7 @@ public:
ACE_ENV_ARG_DECL);
/// Construct a policy of the given type with the information
- /// contained in the CORBA::Any <value>.
+ /// contained in the CORBA::Any @a value.
CORBA::Policy_ptr create_policy (CORBA::PolicyType type,
const CORBA::Any &value
ACE_ENV_ARG_DECL);
diff --git a/TAO/tao/Policy_Set.h b/TAO/tao/Policy_Set.h
index 15ab3515b64..0e3b8e6bc24 100644
--- a/TAO/tao/Policy_Set.h
+++ b/TAO/tao/Policy_Set.h
@@ -102,7 +102,6 @@ public:
private:
ACE_UNIMPLEMENTED_FUNC (TAO_Policy_Set operator=(const TAO_Policy_Set&))
-// ACE_UNIMPLEMENTED_FUNC (TAO_Policy_Set(const TAO_Policy_Set&))
/// Remove and destroy all the policy objects owned by this policy
/// manager.
diff --git a/TAO/tao/Profile.cpp b/TAO/tao/Profile.cpp
index bef8069d982..00580da8ced 100644
--- a/TAO/tao/Profile.cpp
+++ b/TAO/tao/Profile.cpp
@@ -289,7 +289,7 @@ TAO_Profile::create_tagged_profile (void)
this->create_profile_body (encap);
CORBA::ULong length =
- ACE_static_cast(CORBA::ULong,encap.total_length ());
+ static_cast <CORBA::ULong> (encap.total_length ());
#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
// Place the message block in to the Sequence of Octets that we
@@ -381,8 +381,7 @@ TAO_Profile::policies (CORBA::PolicyList *policy_list
(*policy_list)[i]->_tao_encode (out_CDR);
length = out_CDR.total_length ();
- policy_value_seq[i].pvalue.length (ACE_static_cast (CORBA::ULong,
- length));
+ policy_value_seq[i].pvalue.length (static_cast <CORBA::ULong>(length));
buf = policy_value_seq[i].pvalue.get_buffer ();
@@ -409,8 +408,7 @@ TAO_Profile::policies (CORBA::PolicyList *policy_list
length = out_cdr.total_length ();
- tagged_component.component_data.length (ACE_static_cast (CORBA::ULong,
- length));
+ tagged_component.component_data.length (static_cast <CORBA::ULong>(length));
buf = tagged_component.component_data.get_buffer ();
for (const ACE_Message_Block *iterator = out_cdr.begin ();
@@ -457,7 +455,7 @@ TAO_Profile::policies (ACE_ENV_SINGLE_ARG_DECL)
const CORBA::Octet *buf =
tagged_component.component_data.get_buffer ();
- TAO_InputCDR in_cdr (ACE_reinterpret_cast (const char *, buf),
+ TAO_InputCDR in_cdr (reinterpret_cast <const char *> (buf),
tagged_component.component_data.length ());
// Extract the Byte Order
@@ -468,7 +466,7 @@ TAO_Profile::policies (ACE_ENV_SINGLE_ARG_DECL)
return *(stub_->base_profiles ().policy_list_);
}
- in_cdr.reset_byte_order (ACE_static_cast(int, byte_order));
+ in_cdr.reset_byte_order (static_cast <int> (byte_order));
// Now we take out the Messaging::PolicyValueSeq out from the
// CDR.
@@ -504,15 +502,14 @@ TAO_Profile::policies (ACE_ENV_SINGLE_ARG_DECL)
buf = policy_value_seq[i].pvalue.get_buffer ();
TAO_InputCDR in_cdr (
- ACE_reinterpret_cast (const char*, buf),
+ reinterpret_cast <const char*> (buf),
policy_value_seq[i].pvalue.length ());
if (!(in_cdr >> ACE_InputCDR::to_boolean (byte_order)))
ACE_TRY_THROW (CORBA::INV_OBJREF ());
- in_cdr.reset_byte_order (ACE_static_cast (int,
- byte_order));
+ in_cdr.reset_byte_order (static_cast <int> (byte_order));
policy->_tao_decode (in_cdr);
(*pl)[i] = policy._retn ();
@@ -845,7 +842,7 @@ CORBA::Boolean
TAO_Unknown_Profile::do_is_equivalent (const TAO_Profile* other_profile)
{
const TAO_Unknown_Profile * op =
- ACE_dynamic_cast (const TAO_Unknown_Profile *, other_profile);
+ dynamic_cast <const TAO_Unknown_Profile *> (other_profile);
return (CORBA::Boolean) (op == 0 ? 0 : this->body_ == op->body_);
}
@@ -863,8 +860,8 @@ CORBA::ULong
TAO_Unknown_Profile::hash (CORBA::ULong max
ACE_ENV_ARG_DECL_NOT_USED)
{
- return (ACE::hash_pjw (ACE_reinterpret_cast (const char*,
- this->body_.get_buffer ()),
+ return (ACE::hash_pjw (reinterpret_cast <const char*>
+ (this->body_.get_buffer ()),
this->body_.length ()) % max);
}
diff --git a/TAO/tao/Pseudo_VarOut_T.h b/TAO/tao/Pseudo_VarOut_T.h
index c4fdd42c254..bdc0131b322 100644
--- a/TAO/tao/Pseudo_VarOut_T.h
+++ b/TAO/tao/Pseudo_VarOut_T.h
@@ -36,8 +36,6 @@
#include /**/ "ace/pre.h"
-//#include "tao/CORBA_methods.h"
-
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
View Lorry Controller Status