diff options
| -rw-r--r-- | src/base/varargs.hh | 4 | ||||
| -rw-r--r-- | src/cpu/o3/cpu_policy.hh | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/base/varargs.hh b/src/base/varargs.hh index 2ba8c240a..f307e58d1 100644 --- a/src/base/varargs.hh +++ b/src/base/varargs.hh @@ -150,7 +150,7 @@ struct Any : public Base<RECV> template <class RECV> struct Argument : public RefCountingPtr<Base<RECV> > { - typedef RefCountingPtr<Base<RECV> > Base; + typedef RefCountingPtr<VarArgs::Base<RECV> > Base; Argument() { } Argument(const Null &null) { } @@ -169,7 +169,7 @@ template<class RECV> class List { public: - typedef Argument<RECV> Argument; + typedef VarArgs::Argument<RECV> Argument; typedef std::list<Argument> list; typedef typename list::iterator iterator; typedef typename list::const_iterator const_iterator; diff --git a/src/cpu/o3/cpu_policy.hh b/src/cpu/o3/cpu_policy.hh index 32a0adcf1..c06c9a201 100644 --- a/src/cpu/o3/cpu_policy.hh +++ b/src/cpu/o3/cpu_policy.hh @@ -65,7 +65,7 @@ struct SimpleCPUPolicy /** Typedef for the branch prediction unit (which includes the BP, * RAS, and BTB). */ - typedef BPredUnit<Impl> BPredUnit; + typedef ::BPredUnit<Impl> BPredUnit; /** Typedef for the register file. Most classes assume a unified * physical register file. */ @@ -75,15 +75,15 @@ struct SimpleCPUPolicy /** Typedef for the rename map. */ typedef SimpleRenameMap RenameMap; /** Typedef for the ROB. */ - typedef ROB<Impl> ROB; + typedef ::ROB<Impl> ROB; /** Typedef for the instruction queue/scheduler. */ typedef InstructionQueue<Impl> IQ; /** Typedef for the memory dependence unit. */ - typedef MemDepUnit<StoreSet, Impl> MemDepUnit; + typedef ::MemDepUnit<StoreSet, Impl> MemDepUnit; /** Typedef for the LSQ. */ - typedef LSQ<Impl> LSQ; + typedef ::LSQ<Impl> LSQ; /** Typedef for the thread-specific LSQ units. */ - typedef LSQUnit<Impl> LSQUnit; + typedef ::LSQUnit<Impl> LSQUnit; /** Typedef for fetch. */ typedef DefaultFetch<Impl> Fetch; @@ -109,7 +109,7 @@ struct SimpleCPUPolicy typedef DefaultIEWDefaultCommit<Impl> IEWStruct; /** The struct for communication within the IEW stage. */ - typedef IssueStruct<Impl> IssueStruct; + typedef ::IssueStruct<Impl> IssueStruct; /** The struct for all backwards communication. */ typedef TimeBufStruct<Impl> TimeStruct; |