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/cpu/testers/traffic_gen/generators.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/cpu/testers/traffic_gen/generators.cc') diff --git a/src/cpu/testers/traffic_gen/generators.cc b/src/cpu/testers/traffic_gen/generators.cc index f0c126a81..7c6bab92c 100644 --- a/src/cpu/testers/traffic_gen/generators.cc +++ b/src/cpu/testers/traffic_gen/generators.cc @@ -301,7 +301,7 @@ void TraceGen::InputStream::init() { // Create a protobuf message for the header and read it from the stream - Message::PacketHeader header_msg; + ProtoMessage::PacketHeader header_msg; if (!trace.read(header_msg)) { panic("Failed to read packet header from trace\n"); @@ -322,7 +322,7 @@ TraceGen::InputStream::reset() bool TraceGen::InputStream::read(TraceElement& element) { - Message::Packet pkt_msg; + ProtoMessage::Packet pkt_msg; if (trace.read(pkt_msg)) { element.cmd = pkt_msg.cmd(); element.addr = pkt_msg.addr(); -- cgit v1.2.3