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.

diff --git a/src/kern/linux/printk.cc b/src/kern/linux/printk.cc
index a19d81b086cda68e31125ee8fb4e173d039febae..e856e2263f63e86ae7432e450fb559c43672223f 100644 (file)
--- a/src/kern/linux/printk.cc
+++ b/src/kern/linux/printk.cc
@@ -169,7 +169,7 @@ Printk(stringstream &out, Arguments args)
                   break;
 
                 case 's': {
-                    const char *s = (const char *)args;
+                    const char *s = (char *)args;
                     if (!s)
                         s = "<NULL>";
 

diff --git a/src/sim/arguments.hh b/src/sim/arguments.hh
index 5c7941562028ff233e2b3b0067c9cd149954238e..f28f6635a355c16b5ac60dafff1fcba2bd9ec1d6 100644 (file)
--- a/src/sim/arguments.hh
+++ b/src/sim/arguments.hh
@@ -137,7 +137,7 @@ class Arguments
     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;
     }