Renamed OpClass enum members: they all end in 'Op' now.

[gem5.git] / test / paramtest.cc

diff --git a/test/paramtest.cc b/test/paramtest.cc
index 343d75b9116f70a77584764b1a80808a97dc9b4b..2efe23c835bf30f43c5f9e1fa0ac9916195db7f2 100644 (file)
--- a/test/paramtest.cc
+++ b/test/paramtest.cc
@@ -32,8 +32,8 @@
 // to the sources list, then use configs/test.ini as the configuration
 // file.
 //
-#include "sim_object.hh"
-#include "cache.hh"
+#include "sim/sim_object.hh"
+#include "mem/cache/cache.hh"
 
 class ParamTest : public SimObject
 {
@@ -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)