1 files changed, 5 insertions, 13 deletions
diff --git a/src/engine/SCons/MemoizeTests.py b/src/engine/SCons/MemoizeTests.py
index 3606d57..77ff6bc 100644
--- a/src/engine/SCons/MemoizeTests.py
+++ b/src/engine/SCons/MemoizeTests.py
@@ -30,22 +30,18 @@ import TestUnit
 
 import SCons.Memoize
 
-
+# Enable memoization counting
+SCons.Memoize.EnableMemoization()
 
 class FakeObject(object):
 
-    __metaclass__ = SCons.Memoize.Memoized_Metaclass
-
-    memoizer_counters = []
-
     def __init__(self):
         self._memo = {}
 
     def _dict_key(self, argument):
         return argument
 
-    memoizer_counters.append(SCons.Memoize.CountDict('dict', _dict_key))
-
+    @SCons.Memoize.CountDictCall(_dict_key)
     def dict(self, argument):
 
         memo_key = argument
@@ -66,8 +62,7 @@ class FakeObject(object):
 
         return result
 
-    memoizer_counters.append(SCons.Memoize.CountValue('value'))
-
+    @SCons.Memoize.CountMethodCall
     def value(self):
 
         try:
@@ -82,10 +77,7 @@ class FakeObject(object):
         return result
 
     def get_memoizer_counter(self, name):
-        for mc in self.memoizer_counters:
-            if mc.method_name == name:
-                return mc
-        return  None
+        return SCons.Memoize.CounterList.get(self.__class__.__name__+'.'+name, None)
 
 class Returner(object):
     def __init__(self, result):