From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 29953 invoked by alias); 15 Feb 2008 19:52:02 -0000 Received: (qmail 29883 invoked by uid 9561); 15 Feb 2008 19:52:01 -0000 Date: Fri, 15 Feb 2008 19:52:00 -0000 Message-ID: <20080215195201.29868.qmail@sourceware.org> From: swagiaal@sourceware.org To: frysk-cvs@sourceware.org Subject: [SCM] master: swagiaal: Removed cast to DynamicMember in CompositeType. Fixed 5426. X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 03abb6e93ea57566aa3b1b505cabc330287895eb X-Git-Newrev: f0e223f4dca0b63d1889f49bf02e30abb4c9af11 Mailing-List: contact frysk-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: frysk-cvs-owner@sourceware.org Reply-To: frysk@sourceware.org X-SW-Source: 2008-q1/txt/msg00218.txt.bz2 The branch, master has been updated via f0e223f4dca0b63d1889f49bf02e30abb4c9af11 (commit) from 03abb6e93ea57566aa3b1b505cabc330287895eb (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit f0e223f4dca0b63d1889f49bf02e30abb4c9af11 Author: Sami Wagiaalla Date: Thu Feb 14 15:17:17 2008 -0500 swagiaal: Removed cast to DynamicMember in CompositeType. Fixed 5426. frysk-core/frysk/value/ChangeLog +2008-02-14 Sami Wagiaalla + + * CompositeType.java: Removed cast to DynamicMember. + ----------------------------------------------------------------------- Summary of changes: frysk-core/frysk/value/ChangeLog | 4 ++++ frysk-core/frysk/value/CompositeType.java | 12 ++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) First 500 lines of diff: diff --git a/frysk-core/frysk/value/ChangeLog b/frysk-core/frysk/value/ChangeLog index 6ad008d..a4718b8 100644 --- a/frysk-core/frysk/value/ChangeLog +++ b/frysk-core/frysk/value/ChangeLog @@ -1,3 +1,7 @@ +2008-02-14 Sami Wagiaalla + + * CompositeType.java: Removed cast to DynamicMember. + 2008-02-04 Teresa Thomas * Variable.java (printValue): Update. diff --git a/frysk-core/frysk/value/CompositeType.java b/frysk-core/frysk/value/CompositeType.java index 49f7048..f0c7722 100644 --- a/frysk-core/frysk/value/CompositeType.java +++ b/frysk-core/frysk/value/CompositeType.java @@ -172,8 +172,8 @@ public abstract class CompositeType /** * Return the composit's members as an array. PACKAGE PRIVATE. */ - DynamicMember[] members() { - DynamicMember[] m = new DynamicMember[members.size()]; + Member[] members() { + Member[] m = new Member[members.size()]; members.toArray(m); return m; } @@ -268,7 +268,7 @@ public abstract class CompositeType } public String nextName () { - return ((DynamicMember)members.get(idx)).name; + return ((Member)members.get(idx)).name; } public Object next () { @@ -332,11 +332,11 @@ public abstract class CompositeType } // : public PARENT ... boolean first = true; - DynamicMember member = null; + Member member = null; Iterator i = members.iterator(); // Types this inherits come first; print them out. while (i.hasNext()) { - member = (DynamicMember)i.next(); + member = (Member)i.next(); if (!member.inheritance) break; if (first) { @@ -378,7 +378,7 @@ public abstract class CompositeType stringBuilder.append(";\n"); // Advance if (i.hasNext()) - member = (DynamicMember)i.next(); + member = (Member)i.next(); else member = null; } hooks/post-receive -- frysk system monitor/debugger