diff options
author | Kevin Lim <ktlim@umich.edu> | 2005-01-18 13:02:47 -0500 |
---|---|---|
committer | Kevin Lim <ktlim@umich.edu> | 2005-01-18 13:02:47 -0500 |
commit | aed3e6780a54f2d4f008a8cf7f66e2bbdc788a0d (patch) | |
tree | f48c9d361d04cc6276ef33a9898eb0ac61de36d7 /sim/param.hh | |
parent | 783f701247a1013a32d7caab324660c211215a11 (diff) | |
parent | f31a27a030d2e93fef2934aa8642609bb38974af (diff) | |
download | gem5-aed3e6780a54f2d4f008a8cf7f66e2bbdc788a0d.tar.xz |
Merge changes to make m5 g++ 3.4 compatible.
sim/param.cc:
Merge changes.
--HG--
extra : convert_revision : b5044e1f7c48ae2d74d5233dd4fabfb7a801d7c8
Diffstat (limited to 'sim/param.hh')
-rw-r--r-- | sim/param.hh | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sim/param.hh b/sim/param.hh index ac57afa31..f4b9d3450 100644 --- a/sim/param.hh +++ b/sim/param.hh @@ -26,9 +26,10 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __PARAM_HH__ -#define __PARAM_HH__ +#ifndef __SIM_PARAM_HH__ +#define __SIM_PARAM_HH__ +#include <iostream> #include <list> #include <string> #include <vector> @@ -524,7 +525,7 @@ class MappedEnumParam : public EnumParam<EnumParamMap> { if (!isValid()) die("not found"); - return (ENUM)value[n]; + return (ENUM)value[this->n]; } }; @@ -782,4 +783,4 @@ SimObjectVectorParam<OBJ_CLASS *>::showType(std::ostream &os) const \ template <class T> bool parseParam(const std::string &str, T &data); template <class T> void showParam(std::ostream &os, const T &data); -#endif // _PARAM_HH +#endif // _SIM_PARAM_HH_ |