From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 9060 invoked by alias); 4 Mar 2002 03:55:49 -0000 Mailing-List: contact sid-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: sid-owner@sources.redhat.com Received: (qmail 9002 invoked from network); 4 Mar 2002 03:55:43 -0000 Received: from unknown (HELO fillmore.constant.com) (67.113.236.34) by sources.redhat.com with SMTP; 4 Mar 2002 03:55:43 -0000 Received: (from bkoz@localhost) by fillmore.constant.com (8.11.6/8.11.6) id g243tgx22545; Sun, 3 Mar 2002 19:55:42 -0800 Date: Sun, 03 Mar 2002 19:55:00 -0000 Message-Id: <200203040355.g243tgx22545@fillmore.constant.com> X-Authentication-Warning: fillmore.constant.com: bkoz set sender to bkoz@fillmore.constant.com using -f To: sid@sources.redhat.com Subject: preliminary gcc-3_1-branch fixups From: Benjamin Kosnik X-Organization: Red Hat/Nob Hill . X-URL: http://gcc.gnu.org/libstdc++ X-SW-Source: 2002-q1/txt/msg00038.txt.bz2 Found while application testing with gcc-3.1. This is not done, but has been in my tree for a week or two, so I thought I'd post it. At some point, typename usage should probably be made consistent. Or, whatever. tested x86/linux 2002-03-01 Benjamin Kosnik * include/sidbusutil.h: Make typename usage explicit. Index: include/sidbusutil.h =================================================================== RCS file: /cvs/src/src/sid/include/sidbusutil.h,v retrieving revision 1.11 diff -c -p -r1.11 sidbusutil.h *** sidbusutil.h 2001/12/04 08:18:15 1.11 --- sidbusutil.h 2002/03/04 03:50:12 *************** *** 1,6 **** // sidbusutil.h -*- C++ -*- Different types and sizes of buses. ! // Copyright (C) 1999, 2000, 2001 Red Hat. // This file is part of SID and is licensed under the GPL. // See the file COPYING.SID for conditions for redistribution. --- 1,6 ---- // sidbusutil.h -*- C++ -*- Different types and sizes of buses. ! // Copyright (C) 1999, 2000, 2001, 2002 Red Hat. // This file is part of SID and is licensed under the GPL. // See the file COPYING.SID for conditions for redistribution. *************** namespace sidutil *** 811,816 **** --- 811,818 ---- class ro_value_control_register: public value_control_register { public: + typedef typename value_control_register::ValueType ValueType; + ro_value_control_register(control_register_bank* b, sid::host_int_4 o, DataType m, *************** namespace sidutil *** 949,962 **** DataType mask, DataType data) { ! reg_map::iterator i = write_map.find(addr); if (i == write_map.end()) return sid::bus::unmapped; // XXX: or unpermitted? DataType unmatched_mask = mask; // scan through all registers at this address ! for(reg_vector::iterator it = i->second.begin(); it != i->second.end(); it++) { --- 951,964 ---- DataType mask, DataType data) { ! typename reg_map::iterator i = write_map.find(addr); if (i == write_map.end()) return sid::bus::unmapped; // XXX: or unpermitted? DataType unmatched_mask = mask; // scan through all registers at this address ! for(typename reg_vector::iterator it = i->second.begin(); it != i->second.end(); it++) { *************** namespace sidutil *** 984,990 **** DataType mask, DataType& data_out) { ! reg_map::iterator i = read_map.find(addr); if (i == read_map.end()) return sid::bus::unmapped; // XXX: or unpermitted? --- 986,992 ---- DataType mask, DataType& data_out) { ! typename reg_map::iterator i = read_map.find(addr); if (i == read_map.end()) return sid::bus::unmapped; // XXX: or unpermitted? *************** namespace sidutil *** 992,998 **** DataType unmatched_mask = mask; // scan through all registers at this address ! for(reg_vector::iterator it = i->second.begin(); it != i->second.end(); it++) { --- 994,1000 ---- DataType unmatched_mask = mask; // scan through all registers at this address ! for(typename reg_vector::iterator it = i->second.begin(); it != i->second.end(); it++) {