diff options
author | Steve Reinhardt <stever@eecs.umich.edu> | 2004-04-02 23:19:08 -0800 |
---|---|---|
committer | Steve Reinhardt <stever@eecs.umich.edu> | 2004-04-02 23:19:08 -0800 |
commit | b3b0a4705b27a192226e6f97dc78b97eec73613d (patch) | |
tree | cd9b639d0b147b1d5275f585eddc82b2326ad9ff /test/paramtest.cc | |
parent | ae06629947fd3fb2140ed0393287dfaf4719b9eb (diff) | |
parent | 782fb42992076dfd88ffb7d0c4e689d1bb1220d8 (diff) | |
download | gem5-b3b0a4705b27a192226e6f97dc78b97eec73613d.tar.xz |
Merge
--HG--
extra : convert_revision : dadfa2cd97908d769f1e2d5c645140f296ec6a82
Diffstat (limited to 'test/paramtest.cc')
-rw-r--r-- | test/paramtest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/paramtest.cc b/test/paramtest.cc index d63a3aad4..ad0481a96 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; |