[gem5-dev] changeset in gem5: gcc: Small fixes to compile with gcc 4.7

[Andreas Hansson]

changeset 8b9f227b64d8 in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=8b9f227b64d8
description:
        gcc: Small fixes to compile with gcc 4.7

        This patch makes two very minor changes to please gcc 4.7. The
        CopyData function no longer exists and this has been replaced. For
        some reason previous versions of gcc did not complain on the const
        char casting not having an implementation, but this is now addressed.

diffstat:

 src/kern/linux/printk.cc |  2 +-
 src/sim/arguments.hh     |  2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diffs (24 lines):

diff -r cbe7d60037f3 -r 8b9f227b64d8 src/kern/linux/printk.cc
--- a/src/kern/linux/printk.cc  Wed May 30 05:31:11 2012 -0400
+++ b/src/kern/linux/printk.cc  Wed May 30 05:31:48 2012 -0400
@@ -169,7 +169,7 @@
                   break;
 
                 case 's': {
-                    const char *s = (const char *)args;
+                    const char *s = (char *)args;
                     if (!s)
                         s = "<NULL>";
 
diff -r cbe7d60037f3 -r 8b9f227b64d8 src/sim/arguments.hh
--- a/src/sim/arguments.hh      Wed May 30 05:31:11 2012 -0400
+++ b/src/sim/arguments.hh      Wed May 30 05:31:48 2012 -0400
@@ -137,7 +137,7 @@
     template <class T>
     operator T *() {
         T *buf = (T *)data->alloc(sizeof(T));
-        CopyData(tc, buf, getArg(sizeof(T)), sizeof(T));
+        CopyOut(tc, buf, getArg(sizeof(T)), sizeof(T));
         return buf;
     }
 
_______________________________________________
gem5-dev mailing list
gem5-dev@gem5.org
http://m5sim.org/mailman/listinfo/gem5-dev