tick: rename Clock namespace to SimClock

[gem5.git] / src / sim / init.cc

diff --git a/src/sim/init.cc b/src/sim/init.cc
index 2e34740fbc409a86b9338b4bc241f7a01750641d..8057c936985d2b2c9888b7be61b4e7c283a2112f 100644 (file)
--- a/src/sim/init.cc
+++ b/src/sim/init.cc
@@ -39,9 +39,9 @@
 
 #include "base/cprintf.hh"
 #include "base/misc.hh"
+#include "base/types.hh"
 #include "sim/async.hh"
 #include "sim/core.hh"
-#include "base/types.hh"
 #include "sim/init.hh"
 
 using namespace std;
@@ -118,7 +118,7 @@ getCode(const EmbeddedPyModule *pymod)
         pymod->zlen);
     if (ret != Z_OK)
         panic("Could not uncompress code: %s\n", zError(ret));
-    assert(unzlen == pymod->mlen);
+    assert(unzlen == (uLongf)pymod->mlen);
 
     return PyMarshal_ReadObjectFromString((char *)marshalled, pymod->mlen);
 }