diff options
Diffstat (limited to 'TAO/tao')
-rw-r--r-- | TAO/tao/ORB.cpp | 21 | ||||
-rw-r--r-- | TAO/tao/corbafwd.h | 6 | ||||
-rw-r--r-- | TAO/tao/orb.idl | 43 |
3 files changed, 67 insertions, 3 deletions
diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp index 6bf5aaffc58..49ab0de713a 100644 --- a/TAO/tao/ORB.cpp +++ b/TAO/tao/ORB.cpp @@ -1969,6 +1969,27 @@ operator>>(TAO_InputCDR& cdr, TAO_opaque& x) return (CORBA::Boolean) cdr.good_bit (); } +CORBA::Boolean operator<< (TAO_OutputCDR &strm, + const CORBA::TCKind &_tao_enumval) +{ + CORBA::ULong _tao_temp = _tao_enumval; + return strm << _tao_temp; +} + +CORBA::Boolean operator>> (TAO_InputCDR &strm, + CORBA::TCKind &_tao_enumval) +{ + CORBA::ULong _tao_temp = 0; + CORBA::Boolean _tao_result = strm >> _tao_temp; + + if (_tao_result == 1) + { + _tao_enumval = ACE_static_cast (CORBA::TCKind, _tao_temp); + } + + return _tao_result; +} + ACE_Time_Value * CORBA_ORB::get_timeout (void) { diff --git a/TAO/tao/corbafwd.h b/TAO/tao/corbafwd.h index f4c4ce69180..a7dc6bca2f3 100644 --- a/TAO/tao/corbafwd.h +++ b/TAO/tao/corbafwd.h @@ -1794,6 +1794,12 @@ operator<< (TAO_OutputCDR&, const TAO_opaque&); TAO_Export CORBA::Boolean operator>> (TAO_InputCDR&, TAO_opaque&); +TAO_Export CORBA::Boolean +operator<< (TAO_OutputCDR &, const CORBA::TCKind &); + +TAO_Export CORBA::Boolean +operator>> (TAO_InputCDR &, CORBA::TCKind &); + class TAO_ObjectKey; class TAO_ObjectKey_var; class TAO_ObjectKey_out; diff --git a/TAO/tao/orb.idl b/TAO/tao/orb.idl index c26a3ee42b0..65714ddb943 100644 --- a/TAO/tao/orb.idl +++ b/TAO/tao/orb.idl @@ -13,6 +13,46 @@ module CORBA { + enum TCKind + { + tk_null, + tk_void, + tk_short, + tk_long, + tk_ushort, + tk_ulong, + tk_float, + tk_double, + tk_boolean, + tk_char, + tk_octet, + tk_any, + tk_TypeCode, + tk_Principal, + tk_objref, + tk_struct, + tk_union, + tk_enum, + tk_string, + tk_sequence, + tk_array, + tk_alias, + tk_except, + tk_longlong, + tk_ulonglong, + tk_longdouble, + tk_wchar, + tk_wstring, + tk_fixed, + tk_value, + tk_value_box, + tk_native, + tk_abstract_interface, + tk_local_interface, + tk_component, + tk_home + }; + typedef string ORBid; typedef unsigned long Flags; typedef string Identifier; @@ -63,9 +103,6 @@ module CORBA typedef sequence<string> StringSeq; typedef sequence<wstring> WStringSeq; typedef sequence<octet> OctetSeq; - }; -#pragma prefix "" - #endif /* TAO_ORB_IDL */ |