diff options
author | Nilay Vaish <nilay@cs.wisc.edu> | 2014-09-01 16:55:46 -0500 |
---|---|---|
committer | Nilay Vaish <nilay@cs.wisc.edu> | 2014-09-01 16:55:46 -0500 |
commit | d07abd9b5b7c9d0b47e1f3edc87da3823adaad11 (patch) | |
tree | 2d8ff0dc941d635542d3fd722cda4b3437e36431 /src/cpu/testers | |
parent | cee8faaad066cda6710904b5190e7287ff9356af (diff) | |
download | gem5-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/cpu/testers')
-rw-r--r-- | src/cpu/testers/traffic_gen/generators.cc | 4 |
1 files changed, 2 insertions, 2 deletions
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(); |