diff options
| author | Kevin Lim <ktlim@umich.edu> | 2005-02-04 18:25:49 -0500 |
|---|---|---|
| committer | Kevin Lim <ktlim@umich.edu> | 2005-02-04 18:25:49 -0500 |
| commit | 1e7a744c09d0bde70e0f83179fdf4d6059585e4b (patch) | |
| tree | 9bbc7713c4bb79abb3f76b07547d8822f0557caa /sim/param.hh | |
| parent | c389c2e327cc3ee1c988855b05505660c6670172 (diff) | |
| parent | b78d7c2f16dac11ed468de45a088a362605c6493 (diff) | |
| download | gem5-1e7a744c09d0bde70e0f83179fdf4d6059585e4b.tar.xz | |
Hand merge
--HG--
extra : convert_revision : 86c7399b79c17558041a73056745227f70fe8b3b
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_ |