summaryrefslogtreecommitdiff
path: root/src/mem/ruby/system/MachineID.hh
diff options
context:
space:
mode:
authorAndreas Hansson <andreas.hansson@arm.com>2013-02-14 12:24:51 -0500
committerAndreas Hansson <andreas.hansson@arm.com>2013-02-14 12:24:51 -0500
commit7c6bc52bf53f3c424a1a3a12157750c2ca9a17ca (patch)
tree86a66aeadce0e8f1ea7849cd2d8f79aed911aefc /src/mem/ruby/system/MachineID.hh
parent1962e9262d312eff7bba94a8b25b87b6bed20044 (diff)
downloadgem5-7c6bc52bf53f3c424a1a3a12157750c2ca9a17ca.tar.xz
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.
Diffstat (limited to 'src/mem/ruby/system/MachineID.hh')
-rw-r--r--src/mem/ruby/system/MachineID.hh4
1 files changed, 2 insertions, 2 deletions
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