summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Hansson <andreas.hansson@arm.com>2012-05-30 05:31:48 -0400
committerAndreas Hansson <andreas.hansson@arm.com>2012-05-30 05:31:48 -0400
commit1d520cda808704c98dea14f2cfd563b43f73c8d6 (patch)
tree27d9ed779b49983e3639296c2d547eece606b625
parentb8cf48accc611a09314454d1573ee531f2770264 (diff)
downloadgem5-1d520cda808704c98dea14f2cfd563b43f73c8d6.tar.xz
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.
-rw-r--r--src/kern/linux/printk.cc2
-rw-r--r--src/sim/arguments.hh2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/kern/linux/printk.cc b/src/kern/linux/printk.cc
index a19d81b08..e856e2263 100644
--- 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 5c7941562..f28f6635a 100644
--- 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;
}