diff options
| author | Sven Gothel <[email protected]> | 2012-10-17 18:33:55 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2012-10-17 18:33:55 +0200 |
| commit | 43b672e66b2392e1d11b7a4f0d15c3794921c9c8 (patch) | |
| tree | 733d5f0bf0d072f395e90636669b027dc698c8ee /src/java/com/jogamp/gluegen/cgram | |
| parent | cae1502304faac54fb6673ed31eb1493e8388497 (diff) | |
| parent | 4309d1334a2b036c7bf15612199bb7391a57980b (diff) | |
Merge remote-tracking branch 'hharrison/RFC'
Diffstat (limited to 'src/java/com/jogamp/gluegen/cgram')
4 files changed, 5 insertions, 5 deletions
diff --git a/src/java/com/jogamp/gluegen/cgram/types/CompoundType.java b/src/java/com/jogamp/gluegen/cgram/types/CompoundType.java index a4b419f..746212d 100644 --- a/src/java/com/jogamp/gluegen/cgram/types/CompoundType.java +++ b/src/java/com/jogamp/gluegen/cgram/types/CompoundType.java @@ -74,7 +74,7 @@ public abstract class CompoundType extends MemoryLayoutType implements Cloneable public Object clone() { CompoundType n = (CompoundType) super.clone(); if(null!=this.fields) { - n.fields = (ArrayList) this.fields.clone(); + n.fields = new ArrayList<Field>(this.fields); } return n; } diff --git a/src/java/com/jogamp/gluegen/cgram/types/EnumType.java b/src/java/com/jogamp/gluegen/cgram/types/EnumType.java index 7967ba0..d21774f 100644 --- a/src/java/com/jogamp/gluegen/cgram/types/EnumType.java +++ b/src/java/com/jogamp/gluegen/cgram/types/EnumType.java @@ -91,7 +91,7 @@ public class EnumType extends IntType implements Cloneable { n.underlyingType = (IntType) this.underlyingType.clone(); } if(null!=this.enums) { - n.enums = (ArrayList) this.enums.clone(); + n.enums = new ArrayList<Enum>(this.enums); } return n; } diff --git a/src/java/com/jogamp/gluegen/cgram/types/FunctionType.java b/src/java/com/jogamp/gluegen/cgram/types/FunctionType.java index 4c908dc..fcaf97b 100644 --- a/src/java/com/jogamp/gluegen/cgram/types/FunctionType.java +++ b/src/java/com/jogamp/gluegen/cgram/types/FunctionType.java @@ -57,10 +57,10 @@ public class FunctionType extends Type implements Cloneable { public Object clone() { FunctionType n = (FunctionType) super.clone(); if(null!=this.argumentTypes) { - n.argumentTypes = (ArrayList) this.argumentTypes.clone(); + n.argumentTypes = new ArrayList<Type>(this.argumentTypes); } if(null!=this.argumentNames) { - n.argumentNames = (ArrayList) this.argumentNames.clone(); + n.argumentNames = new ArrayList<String>(this.argumentNames); } return n; } diff --git a/src/java/com/jogamp/gluegen/cgram/types/Type.java b/src/java/com/jogamp/gluegen/cgram/types/Type.java index 281f35c..cffbb67 100644 --- a/src/java/com/jogamp/gluegen/cgram/types/Type.java +++ b/src/java/com/jogamp/gluegen/cgram/types/Type.java @@ -269,7 +269,7 @@ public abstract class Type implements Cloneable { } /** Helper routine for list equality comparison */ - static boolean listsEqual(List a, List b) { + static <C> boolean listsEqual(List<C> a, List<C> b) { return ((a == null && b == null) || (a != null && b != null && a.equals(b))); } } |