diff options
| author | Lisa Hsu <hsul@eecs.umich.edu> | 2004-05-11 01:15:18 -0400 |
|---|---|---|
| committer | Lisa Hsu <hsul@eecs.umich.edu> | 2004-05-11 01:15:18 -0400 |
| commit | a5f90eba3bd2d96c6733a6ac9e8d03a9297fae6a (patch) | |
| tree | 06662aecdd919aa0bafb0562fc646465dda5a901 /test/paramtest.cc | |
| parent | 3c7071a6be21fc0c87753758fc09ff28890edc99 (diff) | |
| parent | 2cc4fd87eb643c81d37954cbf4a226e78ebd34bc (diff) | |
| download | gem5-a5f90eba3bd2d96c6733a6ac9e8d03a9297fae6a.tar.xz | |
first pass at merging m5 with linux
--HG--
extra : convert_revision : dfe23349b80ae3b34d3cb95c5734e01ef62f700e
Diffstat (limited to 'test/paramtest.cc')
| -rw-r--r-- | test/paramtest.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/paramtest.cc b/test/paramtest.cc index d63a3aad4..2efe23c83 100644 --- a/test/paramtest.cc +++ b/test/paramtest.cc @@ -57,8 +57,8 @@ BEGIN_DECLARE_SIM_OBJECT_PARAMS(ParamTest) VectorParam<string> vecstring; Param<bool> boolparam; VectorParam<bool> vecbool; - SimObjectParam<mem_hierarchy_obj *> memobj; - SimObjectVectorParam<mem_hierarchy_obj *> vecmemobj; + SimObjectParam<BaseMemory *> memobj; + SimObjectVectorParam<BaseMemory *> vecmemobj; SimpleEnumParam<Enum1Type> enum1; MappedEnumParam<Enum2Type> enum2; SimpleEnumVectorParam<Enum1Type> vecenum1; @@ -76,7 +76,7 @@ const EnumParamMap enum2_map[] = { "ten", 10 }, { "twenty", 20 }, { "thirty", 30 }, - { "fourty", 40 } + { "forty", 40 } }; BEGIN_INIT_SIM_OBJECT_PARAMS(ParamTest) |