summaryrefslogtreecommitdiff
path: root/TAO/tao
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tao')
-rw-r--r--TAO/tao/Environment.i2
-rw-r--r--TAO/tao/Object.cpp4
-rw-r--r--TAO/tao/Object.i2
-rw-r--r--TAO/tao/TypeCode.cpp465
4 files changed, 4 insertions, 469 deletions
diff --git a/TAO/tao/Environment.i b/TAO/tao/Environment.i
index 966da4ea4bc..3875aa4ac65 100644
--- a/TAO/tao/Environment.i
+++ b/TAO/tao/Environment.i
@@ -39,6 +39,6 @@ ACE_INLINE
CORBA::Environment_ptr
CORBA::Environment::_nil (void)
{
- return (CORBA::Environment_ptr) 0;
+ return static_cast <CORBA::Environment_ptr> (0);
}
diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp
index 15580b19b63..14ed6f02fa3 100644
--- a/TAO/tao/Object.cpp
+++ b/TAO/tao/Object.cpp
@@ -335,7 +335,7 @@ CORBA::Object::is_nil_i (CORBA::Object_ptr obj)
// null-object.
if ((!obj->is_evaluated ()) &&
obj->ior ().profiles.length () == 0)
- return 1;
+ return true;
// To accomodate new definitions.
if (obj->orb_core_)
@@ -343,7 +343,7 @@ CORBA::Object::is_nil_i (CORBA::Object_ptr obj)
return obj->orb_core_->object_is_nil (obj);
}
- return 0;
+ return false;
}
diff --git a/TAO/tao/Object.i b/TAO/tao/Object.i
index d65de4e3bc9..e86207df933 100644
--- a/TAO/tao/Object.i
+++ b/TAO/tao/Object.i
@@ -49,7 +49,7 @@ CORBA::is_nil (CORBA::Object_ptr obj)
{
if (obj == 0)
{
- return 1;
+ return true;
}
return CORBA::Object::is_nil_i (obj);
diff --git a/TAO/tao/TypeCode.cpp b/TAO/tao/TypeCode.cpp
deleted file mode 100644
index c4736bc8d30..00000000000
--- a/TAO/tao/TypeCode.cpp
+++ /dev/null
@@ -1,465 +0,0 @@
-// $Id$
-
-#include "TypeCode.h"
-
-
-ACE_RCSID (tao,
- TypeCode,
- "$Id$")
-
-
-#if !defined (__ACE_INLINE__)
-# include "TypeCode.inl"
-#endif /* ! __ACE_INLINE__ */
-
-#include "SystemException.h"
-#include "CDR.h"
-#include "ORB_Constants.h"
-
-#include "debug.h"
-
-#include "ace/OS_NS_string.h"
-
-
-CORBA::TypeCode::~TypeCode (void)
-{
-}
-
-bool
-CORBA::TypeCode::tao_marshal_kind (TAO_OutputCDR & cdr) const
-{
- return cdr << this->kind_;
-}
-
-CORBA::Boolean
-CORBA::TypeCode::equal (TypeCode_ptr tc
- ACE_ENV_ARG_DECL) const
-{
- if (this == tc)
- {
- return true;
- }
- else if (CORBA::is_nil (tc))
- {
- ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 13,
- CORBA::COMPLETED_NO),
- false);
- }
-
- CORBA::TCKind const tc_kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
-
- if (tc_kind != this->kind_)
- return 0;
-
- ACE_TRY
- {
- char const * const tc_id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
-
- char const * const this_id = this->id (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
-
- if (ACE_OS::strcmp (this_id, tc_id) != 0)
- return 0;
-
- char const * const tc_name = tc->name (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
-
- char const * const this_name = this->name (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
-
- if (ACE_OS::strcmp (this_name, tc_name) != 0)
- return 0;
- }
- ACE_CATCH (CORBA::TypeCode::BadKind, ex)
- {
- // Some TypeCodes do not support the id() and name()
- // operations. Ignore the failure, and continue equality
- // verification using TypeCode subclass-specific techniques
- // below.
- }
- ACE_ENDTRY;
- ACE_CHECK_RETURN (0);
-
- return this->equal_i (tc
- ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Boolean
-CORBA::TypeCode::equivalent (TypeCode_ptr tc
- ACE_ENV_ARG_DECL) const
-{
- if (this == tc)
- {
- return true;
- }
- else if (CORBA::is_nil (tc))
- {
- ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 13,
- CORBA::COMPLETED_NO),
- false);
- }
-
- CORBA::TypeCode_ptr const mutable_this =
- const_cast<CORBA::TypeCode_ptr> (this);
-
- CORBA::TypeCode_var unaliased_this =
- TAO::unaliased_typecode (mutable_this
- ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (false);
-
- CORBA::TypeCode_var unaliased_tc =
- TAO::unaliased_typecode (tc
- ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (false);
-
-
- CORBA::TCKind const this_kind =
- unaliased_this->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (false);
-
- CORBA::TCKind const tc_kind =
- unaliased_tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (false);
-
- if (tc_kind != this_kind)
- return false;
-
- ACE_TRY
- {
- char const * const this_id =
- unaliased_this->id (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
-
- char const * const tc_id =
- unaliased_tc->id (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
-
- if (ACE_OS::strlen (this_id) == 0
- || ACE_OS::strlen (tc_id) == 0)
- {
- return unaliased_this->equivalent_i (unaliased_tc.in ()
- ACE_ENV_ARG_PARAMETER);
- }
- else if (ACE_OS::strcmp (this_id, tc_id) != 0)
- {
- return false;
- }
- }
- ACE_CATCH (CORBA::TypeCode::BadKind, ex)
- {
- // Some TypeCodes do not support the id() operation. Ignore the
- // failure, and continue equivalence verification using TypeCode
- // subclass-specific techniques.
- return unaliased_this->equivalent_i (unaliased_tc.in ()
- ACE_ENV_ARG_PARAMETER);
- }
- ACE_ENDTRY;
- ACE_CHECK_RETURN (false);
-
- return true;
-}
-
-char const *
-CORBA::TypeCode::id_i (ACE_ENV_SINGLE_ARG_DECL) const
-{
- ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0);
-}
-
-char const *
-CORBA::TypeCode::name_i (ACE_ENV_SINGLE_ARG_DECL) const
-{
- ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0);
-}
-
-CORBA::ULong
-CORBA::TypeCode::member_count_i (ACE_ENV_SINGLE_ARG_DECL) const
-{
- ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0);
-}
-
-char const *
-CORBA::TypeCode::member_name_i (CORBA::ULong /* index */
- ACE_ENV_ARG_DECL) const
-{
- ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0);
-}
-
-CORBA::TypeCode_ptr
-CORBA::TypeCode::member_type_i (CORBA::ULong /* index */
- ACE_ENV_ARG_DECL) const
-{
- ACE_THROW_RETURN (CORBA::TypeCode::BadKind (),
- CORBA::TypeCode::_nil ());
-}
-
-CORBA::Any *
-CORBA::TypeCode::member_label_i (CORBA::ULong /* index */
- ACE_ENV_ARG_DECL) const
-{
- ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0);
-}
-
-CORBA::TypeCode_ptr
-CORBA::TypeCode::discriminator_type_i (ACE_ENV_SINGLE_ARG_DECL) const
-{
- ACE_THROW_RETURN (CORBA::TypeCode::BadKind (),
- CORBA::TypeCode::_nil ());
-}
-
-CORBA::Long
-CORBA::TypeCode::default_index_i (ACE_ENV_SINGLE_ARG_DECL) const
-{
- ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0);
-}
-
-CORBA::ULong
-CORBA::TypeCode::length_i (ACE_ENV_SINGLE_ARG_DECL) const
-{
- ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0);
-}
-
-CORBA::TypeCode_ptr
-CORBA::TypeCode::content_type_i (ACE_ENV_SINGLE_ARG_DECL) const
-{
- ACE_THROW_RETURN (CORBA::TypeCode::BadKind (),
- CORBA::TypeCode::_nil ());
-}
-
-CORBA::UShort
-CORBA::TypeCode::fixed_digits_i (ACE_ENV_SINGLE_ARG_DECL) const
-{
- ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0);
-}
-
-CORBA::UShort
-CORBA::TypeCode::fixed_scale_i (ACE_ENV_SINGLE_ARG_DECL) const
-{
- ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0);
-}
-
-CORBA::Visibility
-CORBA::TypeCode::member_visibility_i (CORBA::ULong /* index */
- ACE_ENV_ARG_DECL) const
-{
- ACE_THROW_RETURN (CORBA::TypeCode::BadKind (),
- CORBA::PRIVATE_MEMBER);
-}
-
-CORBA::ValueModifier
-CORBA::TypeCode::type_modifier_i (ACE_ENV_SINGLE_ARG_DECL) const
-{
- ACE_THROW_RETURN (CORBA::TypeCode::BadKind (),
- CORBA::VM_NONE);
-}
-
-CORBA::TypeCode_ptr
-CORBA::TypeCode::concrete_base_type_i (ACE_ENV_SINGLE_ARG_DECL) const
-{
- ACE_THROW_RETURN (CORBA::TypeCode::BadKind (),
- CORBA::TypeCode::_nil ());
-}
-
-// ---------------------------------------------------------------
-
-CORBA::TypeCode::Bounds::Bounds (void)
- : CORBA::UserException ("IDL:omg.org/CORBA/TypeCode/Bounds:1.0",
- "Bounds")
-{
-}
-
-CORBA::TypeCode::Bounds*
-CORBA::TypeCode::Bounds::_downcast (CORBA::Exception *ex)
-{
- return dynamic_cast <CORBA::TypeCode::Bounds*> (ex);
-}
-
-CORBA::Exception *
-CORBA::TypeCode::Bounds::_alloc (void)
-{
- CORBA::Exception *retval = 0;
- ACE_NEW_RETURN (retval, ::CORBA::TypeCode::Bounds, 0);
- return retval;
-}
-
-CORBA::Exception *
-CORBA::TypeCode::Bounds::_tao_duplicate (void) const
-{
- CORBA::Exception *result;
- ACE_NEW_RETURN (result,
- CORBA::TypeCode::Bounds (*this),
- 0);
- return result;
-}
-
-void
-CORBA::TypeCode::Bounds::_raise (void) const
-{
- TAO_RAISE(*this);
-}
-
-void
-CORBA::TypeCode::Bounds::_tao_encode (TAO_OutputCDR &cdr
- ACE_ENV_ARG_DECL) const
-{
- if (cdr << this->_rep_id ())
- {
- return;
- }
-
- ACE_THROW (CORBA::MARSHAL ());
-}
-
-void
-CORBA::TypeCode::Bounds::_tao_decode (TAO_InputCDR &
- ACE_ENV_ARG_DECL_NOT_USED)
-{
-}
-
-// ****************************************************************
-
-CORBA::TypeCode::BadKind::BadKind (void)
- : CORBA::UserException ("IDL:omg.org/CORBA/TypeCode/BadKind:1.0",
- "BadKind")
-{
-}
-
-CORBA::TypeCode::BadKind*
-CORBA::TypeCode::BadKind::_downcast (CORBA::Exception *ex)
-{
- return dynamic_cast <CORBA::TypeCode::BadKind*> (ex);
-}
-
-CORBA::Exception *
-CORBA::TypeCode::BadKind::_tao_duplicate (void) const
-{
- CORBA::Exception *result;
- ACE_NEW_RETURN (result,
- CORBA::TypeCode::BadKind (*this),
- 0);
- return result;
-}
-
-void
-CORBA::TypeCode::BadKind::_raise (void) const
-{
- TAO_RAISE(*this);
-}
-
-void
-CORBA::TypeCode::BadKind::_tao_encode (TAO_OutputCDR &cdr
- ACE_ENV_ARG_DECL) const
-{
- if (cdr << this->_rep_id ())
- {
- return;
- }
-
- ACE_THROW (CORBA::MARSHAL ());
-}
-
-void
-CORBA::TypeCode::BadKind::_tao_decode (TAO_InputCDR &
- ACE_ENV_ARG_DECL_NOT_USED)
-{
-}
-
-// ---------------------------------------------------------------
-
-bool
-TAO::TypeCode::marshal (TAO_OutputCDR & cdr,
- CORBA::TypeCode_ptr tc,
- CORBA::ULong offset)
-{
- // Marshal the TypeCode TCKind and TypeCode body.
- //
- // Update the offset value in case a recursive TypeCode is being
- // marshaled.
-
- return
- tc != 0
- && tc->tao_marshal_kind (cdr)
- && tc->tao_marshal (cdr, aligned_offset (offset) + sizeof (CORBA::ULong));
-}
-
-CORBA::ULong
-TAO::TypeCode::aligned_offset (CORBA::ULong offset)
-{
- ptrdiff_t const unaligned_offset =
- static_cast<ptrdiff_t> (offset);
-
- return
- static_cast<CORBA::ULong> (ACE_align_binary (unaligned_offset,
- ACE_CDR::LONG_ALIGN));
-}
-
-// ---------------------------------------------------------------
-
-CORBA::TypeCode_ptr
-TAO::unaliased_typecode (CORBA::TypeCode_ptr tc
- ACE_ENV_ARG_DECL)
-{
- if (CORBA::is_nil (tc))
- {
- ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 13,
- CORBA::COMPLETED_NO),
- tc);
- }
-
- CORBA::TCKind tc_kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (tc);
-
- if (tc_kind == CORBA::tk_alias)
- {
- CORBA::TypeCode_var tc_content =
- CORBA::TypeCode::_duplicate (tc);
-
- // Iterate until we get to the actual unaliased type.
- do
- {
- tc_content =
- tc_content->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (tc);
-
- tc_kind = tc_content->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (tc);
- }
- while (tc_kind == CORBA::tk_alias);
-
- return tc_content._retn ();
- }
-
- return CORBA::TypeCode::_duplicate (tc);
-}
-
-// =========================================================
-
-// Traits specializations for CORBA::TypeCode.
-namespace TAO
-{
- CORBA::TypeCode_ptr
- Objref_Traits<CORBA::TypeCode>::duplicate (CORBA::TypeCode_ptr p)
- {
- return CORBA::TypeCode::_duplicate (p);
- }
-
- void
- Objref_Traits<CORBA::TypeCode>::release (CORBA::TypeCode_ptr p)
- {
- CORBA::release (p);
- }
-
- CORBA::TypeCode_ptr
- Objref_Traits<CORBA::TypeCode>::nil (void)
- {
- return CORBA::TypeCode::_nil ();
- }
-
- CORBA::Boolean
- Objref_Traits<CORBA::TypeCode>::marshal (CORBA::TypeCode_ptr p,
- TAO_OutputCDR & cdr)
- {
- return cdr << p;
- }
-}
View Lorry Controller Status