Merge with head, hopefully the last time for this batch.

2012-01-31 22:40:08 -08:00
parent e88165a431 7d4f187700
commit ea8b347dc5
132 changed files with 1719 additions and 909 deletions
--- a/src/python/m5/SimObject.py
+++ b/src/python/m5/SimObject.py
@@ -477,7 +477,7 @@ struct PyObject;

 #include <string>

-struct EventQueue;
+class EventQueue;
 ''')
        for param in params:
            param.cxx_predecls(code)