--- a/src/devices/mesh/mesh-wifi-interface-mac.cc	Wed Jul 22 16:57:12 2009 +0400
+++ b/src/devices/mesh/mesh-wifi-interface-mac.cc	Thu Jul 23 13:39:51 2009 +0400
@@ -399,8 +399,7 @@
     }
   m_stats.sentFrames++;
   m_stats.sentBytes += packet->GetSize ();
-  Queues::iterator i = m_queues.find (AC_VO);
-  if (i == m_queues.end ())
+  if (m_queues.find (AC_VO) == m_queues.end ())
     {
       NS_FATAL_ERROR ("Voice queue is not set up!");
     }
@@ -654,8 +653,7 @@
 void
 MeshWifiInterfaceMac::SetQueue (Ptr<DcaTxop> queue, AccessClass ac)
 {
-  Queues::iterator i = m_queues.find (ac);
-  if (i != m_queues.end ())
+  if (m_queues.find (ac) != m_queues.end ())
     {
       NS_LOG_WARN ("Queue is already set!");
       return;
@@ -667,7 +665,7 @@
 Ptr<DcaTxop>
 MeshWifiInterfaceMac::GetQueue (AccessClass ac)
 {
-  Queues::iterator i = m_queues.find (ac);
+  Queues::const_iterator i = m_queues.find (ac);
   if (i != m_queues.end ())
     {
       NS_LOG_WARN ("Queue is not found! Check access class!");