From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 14505 invoked by alias); 4 Mar 2008 05:12:09 -0000 Received: (qmail 14476 invoked by uid 367); 4 Mar 2008 05:12:06 -0000 Date: Tue, 04 Mar 2008 05:12:00 -0000 Message-ID: <20080304051206.14461.qmail@sourceware.org> From: cagney@sourceware.org To: frysk-cvs@sourceware.org Subject: [SCM] master: Fix 5859. X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 7a6afe575bcd1f6ca52d55c97c0fe77a1b248477 X-Git-Newrev: 935896fac9a7bcdfd692bf34d1dbbb55aaae5fe3 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/msg00303.txt.bz2 The branch, master has been updated via 935896fac9a7bcdfd692bf34d1dbbb55aaae5fe3 (commit) from 7a6afe575bcd1f6ca52d55c97c0fe77a1b248477 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit 935896fac9a7bcdfd692bf34d1dbbb55aaae5fe3 Author: Andrew Cagney Date: Tue Mar 4 00:11:30 2008 -0500 Fix 5859. frysk-core/frysk/value/ChangeLog 2008-03-04 Andrew Cagney * TestComposite.java: Update to match 2008-02-19 Stan Cox CompositeType.java change. Fixes #5859. ----------------------------------------------------------------------- Summary of changes: frysk-core/frysk/value/ChangeLog | 5 +++++ frysk-core/frysk/value/TestComposite.java | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) First 500 lines of diff: diff --git a/frysk-core/frysk/value/ChangeLog b/frysk-core/frysk/value/ChangeLog index 52b78f9..1fe75b5 100644 --- a/frysk-core/frysk/value/ChangeLog +++ b/frysk-core/frysk/value/ChangeLog @@ -1,3 +1,8 @@ +2008-03-04 Andrew Cagney + + * TestComposite.java: Update to match 2008-02-19 Stan Cox + CompositeType.java change. Fixes #5859. + 2008-03-03 Andrew Cagney * TestClass.java: Use frysk.config.BuildCompiler. diff --git a/frysk-core/frysk/value/TestComposite.java b/frysk-core/frysk/value/TestComposite.java index ae88291..59dc86e 100644 --- a/frysk-core/frysk/value/TestComposite.java +++ b/frysk-core/frysk/value/TestComposite.java @@ -1,6 +1,6 @@ // This file is part of the program FRYSK. // -// Copyright 2007, Red Hat Inc. +// Copyright 2007, 2008, Red Hat Inc. // // FRYSK is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by @@ -178,18 +178,18 @@ public class TestComposite public void testPublicPrivateType() { CompositeType t = new StructType("STRUCT", 4) .addMember("pub1", scratchSourceLocation, bigInt32, 0, Access.PUBLIC) - .addMember("pub2", scratchSourceLocation, bigInt32, 0, Access.PUBLIC) .addMember("priv1", scratchSourceLocation, bigInt32, 0, Access.PRIVATE) - .addMember("prot1", scratchSourceLocation, bigInt32, 0, Access.PROTECTED); + .addMember("prot1", scratchSourceLocation, bigInt32, 0, Access.PROTECTED) + .addMember("pub2", scratchSourceLocation, bigInt32, 0, Access.PUBLIC); assertEquals("toPrint", "struct STRUCT {\n" - + " public:\n" + " int32_t pub1;\n" - + " int32_t pub2;\n" + " private:\n" + " int32_t priv1;\n" + " protected:\n" + " int32_t prot1;\n" + + " public:\n" + + " int32_t pub2;\n" + "}", t.toPrint()); } hooks/post-receive -- frysk system monitor/debugger