Mercurial > hg > icedtea8-forest > corba
changeset 4:5e61d5df6258 jdk7-b25
6627817: Remove ^M characters in all files (Makefiles too)
Summary: Some files included the use of the ^M character, which has been deleted
Reviewed-by: xdono
| author | ohair |
|---|---|
| date | Tue, 25 Mar 2008 14:42:28 -0700 |
| parents | a51017b6ba6d |
| children | 0043eb3d4e62 |
| files | src/share/classes/com/sun/corba/se/impl/corba/orb_config_design.txt src/share/classes/org/omg/CORBA/ir.idl src/share/classes/org/omg/DynamicAny/DynamicAny.idl |
| diffstat | 3 files changed, 21 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/com/sun/corba/se/impl/corba/orb_config_design.txt Thu Mar 06 13:56:47 2008 -0800 +++ b/src/share/classes/com/sun/corba/se/impl/corba/orb_config_design.txt Tue Mar 25 14:42:28 2008 -0700 @@ -318,7 +318,7 @@ 11. RequestHandler and ORB - The RH interface is currently implemented in the ORB class, but migūt better be a separate + The RH interface is currently implemented in the ORB class, but might better be a separate class. The API is currently almost the same as a ServerSubcontract. Should we regularize this? Also, the API would need to be extended to handle shutdown properly.
--- a/src/share/classes/org/omg/CORBA/ir.idl Thu Mar 06 13:56:47 2008 -0800 +++ b/src/share/classes/org/omg/CORBA/ir.idl Tue Mar 25 14:42:28 2008 -0700 @@ -774,18 +774,18 @@ // orbos 98-01-18: Objects By Value -- end - enum TCKind { - tk_null, tk_void, + 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_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 }; interface NativeDef : TypedefDef {
--- a/src/share/classes/org/omg/DynamicAny/DynamicAny.idl Thu Mar 06 13:56:47 2008 -0800 +++ b/src/share/classes/org/omg/DynamicAny/DynamicAny.idl Tue Mar 25 14:42:28 2008 -0700 @@ -1042,24 +1042,24 @@ /** * DynValueCommon provides operations supported by both the DynValue and DynValueBox interfaces. */ - interface DynValueCommon : DynAny { + interface DynValueCommon : DynAny { /** * Returns true if the DynValueCommon represents a null value type. */ - boolean is_null(); + boolean is_null(); /** * Changes the representation of a DynValueCommon to a null value type. */ - void set_to_null(); + void set_to_null(); /** * Replaces a null value type with a newly constructed value. Its components are initialized * to default values as in DynAnyFactory.create_dyn_any_from_type_code. * If the DynValueCommon represents a non-null value type, then this operation has no effect. */ - void set_to_value(); - }; + void set_to_value(); + }; /** * DynValue objects support the manipulation of IDL non-boxed value types. @@ -1164,14 +1164,14 @@ * of the boxed type. A DynValueBox representing a null value type has no components * and a current position of -1. */ - interface DynValueBox : DynValueCommon { + interface DynValueBox : DynValueCommon { /** * Returns the boxed value as an Any. * * @exception InvalidValue if this object represents a null value box type */ - any get_boxed_value() + any get_boxed_value() raises(InvalidValue); /** @@ -1189,7 +1189,7 @@ * * @exception InvalidValue if this object represents a null value box type */ - DynAny get_boxed_value_as_dyn_any() + DynAny get_boxed_value_as_dyn_any() raises(InvalidValue); /** @@ -1199,7 +1199,7 @@ * @exception TypeMismatch if this object represents a non-null value box type and the type * of the parameter is not matching the current boxed value type. */ - void set_boxed_value_as_dyn_any(in DynAny boxed) + void set_boxed_value_as_dyn_any(in DynAny boxed) raises(TypeMismatch); };