From d07abd9b5b7c9d0b47e1f3edc87da3823adaad11 Mon Sep 17 00:00:00 2001 From: Nilay Vaish Date: Mon, 1 Sep 2014 16:55:46 -0500 Subject: 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. --- src/mem/comm_monitor.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/mem') 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); -- cgit v1.2.3