summaryrefslogtreecommitdiff
path: root/src/mem
diff options
context:
space:
mode:
authorNilay Vaish <nilay@cs.wisc.edu>2014-09-01 16:55:46 -0500
committerNilay Vaish <nilay@cs.wisc.edu>2014-09-01 16:55:46 -0500
commitd07abd9b5b7c9d0b47e1f3edc87da3823adaad11 (patch)
tree2d8ff0dc941d635542d3fd722cda4b3437e36431 /src/mem
parentcee8faaad066cda6710904b5190e7287ff9356af (diff)
downloadgem5-d07abd9b5b7c9d0b47e1f3edc87da3823adaad11.tar.xz
mem: change the namespace Message to ProtoMessage
The namespace Message conflicts with the Message data type used extensively in Ruby. Since Ruby is being moved to the same Master/Slave ports based configuration style as the rest of gem5, this conflict needs to be resolved. Hence, the namespace is being renamed to ProtoMessage.
Diffstat (limited to 'src/mem')
-rw-r--r--src/mem/comm_monitor.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mem/comm_monitor.cc b/src/mem/comm_monitor.cc
index 3bfaad289..3c3af76ea 100644
--- a/src/mem/comm_monitor.cc
+++ b/src/mem/comm_monitor.cc
@@ -84,7 +84,7 @@ CommMonitor::CommMonitor(Params* params)
// Create a protobuf message for the header and write it to
// the stream
- Message::PacketHeader header_msg;
+ ProtoMessage::PacketHeader header_msg;
header_msg.set_obj_id(name());
header_msg.set_tick_freq(SimClock::Frequency);
traceStream->write(header_msg);
@@ -214,7 +214,7 @@ CommMonitor::recvTimingReq(PacketPtr pkt)
// Create a protobuf message representing the
// packet. Currently we do not preserve the flags in the
// trace.
- Message::Packet pkt_msg;
+ ProtoMessage::Packet pkt_msg;
pkt_msg.set_tick(curTick());
pkt_msg.set_cmd(cmd);
pkt_msg.set_flags(req_flags);