Merge zizzer.eecs.umich.edu:/bk/newmem

[gem5.git] / src / mem / cache / tags / split.hh

diff --git a/src/mem/cache/tags/split.hh b/src/mem/cache/tags/split.hh
index e6ace092103bec6eab4a6ccdc0c38bdceb86a715..840b689403fe5c2c6b82fc437b1e44fb3c38b18b 100644 (file)
--- a/src/mem/cache/tags/split.hh
+++ b/src/mem/cache/tags/split.hh
@@ -36,6 +36,7 @@
 #ifndef __SPLIT_HH__
 #define __SPLIT_HH__
 
+#include <cstring>
 #include <list>
 
 #include "mem/cache/cache_blk.hh" // base class
@@ -234,6 +235,7 @@ class Split : public BaseTags
     int extractSet(Addr addr) const
     {
         panic("should never call this!\n");
+        M5_DUMMY_RETURN
     }
 
     /**
@@ -281,7 +283,7 @@ class Split : public BaseTags
      */
     void readData(SplitBlk *blk, uint8_t *data)
     {
-        memcpy(data, blk->data, blk->size);
+        std::memcpy(data, blk->data, blk->size);
     }
 
     /**