sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

gcc: Version 4.3 is pretty anal about shadowing types, placate it.

Browse source 
In the future, it would be nice to put the O3CPU into its own
namespace so that we don't end up hardcoding pointers to the global
namespace.
This commit is contained in:
Nathan Binkert 2008-09-22 08:25:57 -07:00
parent f3f4b17c5b
commit 6efb930e19
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/base/varargs.hh
View file

@ -150,7 +150,7 @@ struct Any : public Base<RECV>
template <class RECV> template <class RECV>
struct Argument : public RefCountingPtr<Base<RECV> > struct Argument : public RefCountingPtr<Base<RECV> >
{ {
typedef RefCountingPtr<Base<RECV> > Base; typedef RefCountingPtr<VarArgs::Base<RECV> > Base;
Argument() { } Argument() { }
Argument(const Null &null) { } Argument(const Null &null) { }
@ -169,7 +169,7 @@ template<class RECV>
class List class List
{ {
public: public:
typedef Argument<RECV> Argument; typedef VarArgs::Argument<RECV> Argument;
typedef std::list<Argument> list; typedef std::list<Argument> list;
typedef typename list::iterator iterator; typedef typename list::iterator iterator;
typedef typename list::const_iterator const_iterator; typedef typename list::const_iterator const_iterator;

12
src/cpu/o3/cpu_policy.hh
View file

@ -65,7 +65,7 @@ struct SimpleCPUPolicy
/** Typedef for the branch prediction unit (which includes the BP, /** Typedef for the branch prediction unit (which includes the BP,
* RAS, and BTB). * RAS, and BTB).
*/ */
typedef BPredUnit<Impl> BPredUnit; typedef ::BPredUnit<Impl> BPredUnit;
/** Typedef for the register file. Most classes assume a unified /** Typedef for the register file. Most classes assume a unified
* physical register file. * physical register file.
*/ */
@ -75,15 +75,15 @@ struct SimpleCPUPolicy
/** Typedef for the rename map. */ /** Typedef for the rename map. */
typedef SimpleRenameMap RenameMap; typedef SimpleRenameMap RenameMap;
/** Typedef for the ROB. */ /** Typedef for the ROB. */
typedef ROB<Impl> ROB; typedef ::ROB<Impl> ROB;
/** Typedef for the instruction queue/scheduler. */ /** Typedef for the instruction queue/scheduler. */
typedef InstructionQueue<Impl> IQ; typedef InstructionQueue<Impl> IQ;
/** Typedef for the memory dependence unit. */ /** Typedef for the memory dependence unit. */
typedef MemDepUnit<StoreSet, Impl> MemDepUnit; typedef ::MemDepUnit<StoreSet, Impl> MemDepUnit;
/** Typedef for the LSQ. */ /** Typedef for the LSQ. */
typedef LSQ<Impl> LSQ; typedef ::LSQ<Impl> LSQ;
/** Typedef for the thread-specific LSQ units. */ /** Typedef for the thread-specific LSQ units. */
typedef LSQUnit<Impl> LSQUnit; typedef ::LSQUnit<Impl> LSQUnit;
/** Typedef for fetch. */ /** Typedef for fetch. */
typedef DefaultFetch<Impl> Fetch; typedef DefaultFetch<Impl> Fetch;
@ -109,7 +109,7 @@ struct SimpleCPUPolicy
typedef DefaultIEWDefaultCommit<Impl> IEWStruct; typedef DefaultIEWDefaultCommit<Impl> IEWStruct;
/** The struct for communication within the IEW stage. */ /** The struct for communication within the IEW stage. */
typedef IssueStruct<Impl> IssueStruct; typedef ::IssueStruct<Impl> IssueStruct;
/** The struct for all backwards communication. */ /** The struct for all backwards communication. */
typedef TimeBufStruct<Impl> TimeStruct; typedef TimeBufStruct<Impl> TimeStruct;