summaryrefslogtreecommitdiff
path: root/src/kern
diff options
context:
space:
mode:
authorAndreas Hansson <andreas.hansson@arm.com>2012-07-02 08:21:53 -0400
committerAndreas Hansson <andreas.hansson@arm.com>2012-07-02 08:21:53 -0400
commit92eaac07118a620c2c9dd48921eefcb7ca4422a8 (patch)
treedd46f8d5d1661f2af59dd467ad5eab661be80199 /src/kern
parentd2ebade5a5f5a20a159f62b9e76c6abdf8b00726 (diff)
downloadgem5-92eaac07118a620c2c9dd48921eefcb7ca4422a8.tar.xz
gcc: Fix warnings for gcc 4.7 and clang 3.1
This patch fixes two warnings, one related to a narrowing conversion (int to MachInst), and one due to the cast operator for arguments and a mismatch in const-ness (const void* and void*).
Diffstat (limited to 'src/kern')
-rw-r--r--src/kern/tru64/printf.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/kern/tru64/printf.cc b/src/kern/tru64/printf.cc
index 600e96818..dfd300c12 100644
--- a/src/kern/tru64/printf.cc
+++ b/src/kern/tru64/printf.cc
@@ -177,7 +177,7 @@ Printf(Arguments args)
break;
case 's': {
- const char *s = (const char *)args;
+ const char *s = (char *)args;
if (!s)
s = "<NULL>";