diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2005-03-25 13:09:17 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2005-03-25 13:09:17 +0000 |
| commit | af2375696265a829da6b5c4f59cd2bc0b8923eee (patch) | |
| tree | b5a70aa2a915b032c20036b5c76edee34c5ca288 | |
| parent | f83227db2234bb0d24563ac8ce04ef8c640db955 (diff) | |
| download | ATCD-af2375696265a829da6b5c4f59cd2bc0b8923eee.tar.gz | |
*** empty log message ***
| -rw-r--r-- | TAO/tao/CDR_Encaps_Codec.cpp | 1 | ||||
| -rw-r--r-- | TAO/tao/Empty_Param_TypeCode.cpp | 4 | ||||
| -rw-r--r-- | TAO/tao/TypeCode.cpp | 8 | ||||
| -rw-r--r-- | TAO/tao/TypeCode.h | 10 | ||||
| -rw-r--r-- | TAO/tao/append.cpp | 5 | ||||
| -rw-r--r-- | TAO/tao/skip.cpp | 5 |
6 files changed, 20 insertions, 13 deletions
diff --git a/TAO/tao/CDR_Encaps_Codec.cpp b/TAO/tao/CDR_Encaps_Codec.cpp index 706f516ae67..b732af6cf21 100644 --- a/TAO/tao/CDR_Encaps_Codec.cpp +++ b/TAO/tao/CDR_Encaps_Codec.cpp @@ -13,6 +13,7 @@ #include "Any_Unknown_IDL_Type.h" #include "SystemException.h" #include "ORB_Constants.h" +#include "TypeCode_Constants.h" #include "ace/Auto_Ptr.h" #include "ace/OS_NS_string.h" diff --git a/TAO/tao/Empty_Param_TypeCode.cpp b/TAO/tao/Empty_Param_TypeCode.cpp index b15fa95f4ff..cf5980194a2 100644 --- a/TAO/tao/Empty_Param_TypeCode.cpp +++ b/TAO/tao/Empty_Param_TypeCode.cpp @@ -37,8 +37,8 @@ TAO::TypeCode::Empty_Param::tao_release (void) } CORBA::Boolean -TAO::TypeCode::Empty_Param::equal_i (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const +TAO::TypeCode::Empty_Param::equal_i (CORBA::TypeCode_ptr + ACE_ENV_ARG_DECL_NOT_USED) const { // Equality has already been established in the // CORBA::TypeCode base class. diff --git a/TAO/tao/TypeCode.cpp b/TAO/tao/TypeCode.cpp index 956278f7fbf..41ec1062484 100644 --- a/TAO/tao/TypeCode.cpp +++ b/TAO/tao/TypeCode.cpp @@ -175,8 +175,8 @@ CORBA::TypeCode::concrete_base_type_i (ACE_ENV_SINGLE_ARG_DECL) const // --------------------------------------------------------------- bool -TAO::operator<< (TAO_OutputCDR & cdr, - CORBA::TypeCode_ptr tc) +operator<< (TAO_OutputCDR & cdr, + CORBA::TypeCode_ptr tc) { ACE_DECLARE_NEW_CORBA_ENV; @@ -195,8 +195,8 @@ TAO::operator<< (TAO_OutputCDR & cdr, } bool -TAO::operator>> (TAO_InputCDR & cdr, - CORBA::TypeCode_ptr & tc) +operator>> (TAO_InputCDR & cdr, + CORBA::TypeCode_ptr & tc) { ACE_DECLARE_NEW_CORBA_ENV; diff --git a/TAO/tao/TypeCode.h b/TAO/tao/TypeCode.h index 594e3b6619d..ac18e76352c 100644 --- a/TAO/tao/TypeCode.h +++ b/TAO/tao/TypeCode.h @@ -479,13 +479,13 @@ namespace CORBA } // End namespace CORBA -namespace TAO -{ - extern TAO_Export bool operator<< (TAO_OutputCDR & cdr, +TAO_Export bool operator<< (TAO_OutputCDR & cdr, CORBA::TypeCode_ptr tc); - extern TAO_Export bool operator>> (TAO_InputCDR & cdr, - CORBA::TypeCode_ptr & tc); +TAO_Export bool operator>> (TAO_InputCDR & cdr, + CORBA::TypeCode_ptr & tc); +namespace TAO +{ /// Return the unaliased content @c TypeCode of the given /// @c TypeCode. CORBA::TypeCode_ptr unaliased_typecode (CORBA::TypeCode_ptr tc diff --git a/TAO/tao/append.cpp b/TAO/tao/append.cpp index e315461546c..585a517aa95 100644 --- a/TAO/tao/append.cpp +++ b/TAO/tao/append.cpp @@ -52,7 +52,10 @@ TAO_Marshal_Primitive::append (CORBA::TypeCode_ptr tc, TAO::traverse_status retval = TAO::TRAVERSE_CONTINUE; // status of encode operation - switch (tc->kind_) + CORBA::TCKind const k = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK_RETURN (TAO::TRAVERSE_STOP) + + switch (k) { case CORBA::tk_null: case CORBA::tk_void: diff --git a/TAO/tao/skip.cpp b/TAO/tao/skip.cpp index 461290890d5..04b1fba392e 100644 --- a/TAO/tao/skip.cpp +++ b/TAO/tao/skip.cpp @@ -44,7 +44,10 @@ TAO_Marshal_Primitive::skip (CORBA::TypeCode_ptr tc, // Status of skip operation. TAO::traverse_status retval = TAO::TRAVERSE_CONTINUE; - switch (tc->kind_) + CORBA::TCKind const k = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK_RETURN (TAO::TRAVERSE_STOP) + + switch (k) { case CORBA::tk_null: case CORBA::tk_void: |