diff options
author | Mark Wielaard <mark@klomp.org> | 2005-11-15 23:20:01 +0000 |
---|---|---|
committer | Mark Wielaard <mark@klomp.org> | 2005-11-15 23:20:01 +0000 |
commit | 8079928c7ce26b013601b8ebf20c69c63181278f (patch) | |
tree | a5eb7cf42a51869cc8aa1fad7ad6a90cca47fdd8 /libjava/classpath/org/omg/CORBA/NameValuePairHelper.java | |
parent | 7efc292acde3fb6dcc93984451ad21a109518417 (diff) |
Imported GNU Classpath 0.19 + gcj-import-20051115.
* sources.am: Regenerated.
* Makefile.in: Likewise.
* scripts/makemake.tcl: Use glob -nocomplain.
git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@107049 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/classpath/org/omg/CORBA/NameValuePairHelper.java')
-rw-r--r-- | libjava/classpath/org/omg/CORBA/NameValuePairHelper.java | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/libjava/classpath/org/omg/CORBA/NameValuePairHelper.java b/libjava/classpath/org/omg/CORBA/NameValuePairHelper.java index f40e570a79b..5d2430b23bb 100644 --- a/libjava/classpath/org/omg/CORBA/NameValuePairHelper.java +++ b/libjava/classpath/org/omg/CORBA/NameValuePairHelper.java @@ -39,9 +39,10 @@ exception statement from your version. */ package org.omg.CORBA; import gnu.CORBA.DynAn.NameValuePairHolder; -import gnu.CORBA.aliasTypeCode; -import gnu.CORBA.primitiveTypeCode; -import gnu.CORBA.stringTypeCode; +import gnu.CORBA.typecodes.AliasTypeCode; +import gnu.CORBA.typecodes.PrimitiveTypeCode; +import gnu.CORBA.typecodes.StringTypeCode; +import gnu.CORBA.Minor; import org.omg.CORBA.portable.InputStream; import org.omg.CORBA.portable.OutputStream; @@ -75,7 +76,9 @@ public abstract class NameValuePairHelper } catch (ClassCastException ex) { - throw new BAD_OPERATION("NameValuePair expected"); + BAD_OPERATION bad = new BAD_OPERATION("NameValuePair expected"); + bad.minor = Minor.Any; + throw bad; } } @@ -117,12 +120,12 @@ public abstract class NameValuePairHelper StructMember[] members = new StructMember[ 2 ]; TypeCode t_id = - new aliasTypeCode(new stringTypeCode(TCKind.tk_string), "", "id"); + new AliasTypeCode(new StringTypeCode(TCKind.tk_string), "", "id"); members [ 0 ] = new StructMember("id", t_id, null); members [ 1 ] = - new StructMember("value", new primitiveTypeCode(TCKind.tk_any), null); + new StructMember("value", new PrimitiveTypeCode(TCKind.tk_any), null); typeCode = ORB.init().create_struct_tc(id(), "NameValuePair", members); } |