diff options
author | Nathan Binkert <nate@binkert.org> | 2008-09-22 08:25:57 -0700 |
---|---|---|
committer | Nathan Binkert <nate@binkert.org> | 2008-09-22 08:25:57 -0700 |
commit | 6efb930e19056e3421f3bb1996bf370883873b32 (patch) | |
tree | e40d9892521d375a426525e357f666839b1ea8a5 /src/base | |
parent | f3f4b17c5b6f594524d54176c15c23d6338c60a4 (diff) | |
download | gem5-6efb930e19056e3421f3bb1996bf370883873b32.tar.xz |
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.
Diffstat (limited to 'src/base')
-rw-r--r-- | src/base/varargs.hh | 4 |
1 files changed, 2 insertions, 2 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; |