Bug 1368093 - Fix name collision between Solaris queue(9F) and C++ std::queue. r=billm
authorPetr Sumbera <petr.sumbera@oracle.com>
Fri, 26 May 2017 09:10:59 -0700
changeset 409070 c74f1584dec6bbfdf36331699b5cbad18c05be85
parent 409069 dbeac19df1fe7823e856dd1404542a1f118076f8
child 409071 23c3721b94e901cddd295a378100e9cf98afadc0
push id7391
push usermtabara@mozilla.com
push dateMon, 12 Jun 2017 13:08:53 +0000
treeherdermozilla-beta@2191d7f87e2e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbillm
bugs1368093
milestone55.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1368093 - Fix name collision between Solaris queue(9F) and C++ std::queue. r=billm
ipc/glue/MessageLink.cpp
--- a/ipc/glue/MessageLink.cpp
+++ b/ipc/glue/MessageLink.cpp
@@ -278,34 +278,34 @@ ProcessLink::OnChannelOpened()
     AssertIOThread();
 
     {
         MonitorAutoLock lock(*mChan->mMonitor);
 
         mExistingListener = mTransport->set_listener(this);
 #ifdef DEBUG
         if (mExistingListener) {
-            queue<Message> pending;
+            std::queue<Message> pending;
             mExistingListener->GetQueuedMessages(pending);
             MOZ_ASSERT(pending.empty());
         }
 #endif  // DEBUG
 
         mChan->mChannelState = ChannelOpening;
         lock.Notify();
     }
     /*assert*/mTransport->Connect();
 }
 
 void
 ProcessLink::OnTakeConnectedChannel()
 {
     AssertIOThread();
 
-    queue<Message> pending;
+    std::queue<Message> pending;
     {
         MonitorAutoLock lock(*mChan->mMonitor);
 
         mChan->mChannelState = ChannelConnected;
 
         mExistingListener = mTransport->set_listener(this);
         if (mExistingListener) {
             mExistingListener->GetQueuedMessages(pending);