From: Andreas Hansson <andreas.hansson@arm.com>
Date: Thu, 14 Feb 2013 17:24:51 +0000 (-0500)
Subject: Ruby: Fix compilation errors on gcc 4.7 and clang 3.2
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7c6bc52bf53f3c424a1a3a12157750c2ca9a17ca;p=gem5.git

Ruby: Fix compilation errors on gcc 4.7 and clang 3.2

This patch fixes a few (recently added) errors that prevented gem5 from
compiling on more recent versions of gcc and clang.
---

diff --git a/src/mem/ruby/system/MachineID.hh b/src/mem/ruby/system/MachineID.hh
index 0bcd10efc..0ad898959 100644
--- a/src/mem/ruby/system/MachineID.hh
+++ b/src/mem/ruby/system/MachineID.hh
@@ -39,10 +39,10 @@ struct MachineID
 {
     MachineType type;
     //! range: 0 ... number of this machine's components in system - 1
-    uint32_t num;
+    NodeID num;
 
     MachineType getType() const { return type; }
-    uint32_t getNum() const { return num; }
+    NodeID getNum() const { return num; }
 };
 
 inline std::string