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.

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);