From 6efb930e19056e3421f3bb1996bf370883873b32 Mon Sep 17 00:00:00 2001
From: Nathan Binkert <nate@binkert.org>
Date: Mon, 22 Sep 2008 08:25:57 -0700
Subject: gcc: Version 4.3 is pretty anal about shadowing types, placate it. 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.

---
 src/base/varargs.hh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/base')

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;
-- 
cgit v1.2.3