--- a/src/devices/wifi/cr-mac-stations.cc	Tue Oct 16 15:43:26 2007 +0200
+++ b/src/devices/wifi/cr-mac-stations.cc	Tue Oct 16 15:57:45 2007 +0200
@@ -21,7 +21,7 @@
 #include "mac-stations.h"
 #include "cr-mac-stations.h"
 
-#include <cassert>
+#include "ns3/assert.h"
 
 namespace ns3 {
 

--- a/src/devices/wifi/dca-txop.cc	Tue Oct 16 15:43:26 2007 +0200
+++ b/src/devices/wifi/dca-txop.cc	Tue Oct 16 15:57:45 2007 +0200
@@ -18,7 +18,7 @@
  * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
  */
 
-#include <cassert>
+#include "ns3/assert.h"
 
 #include "ns3/packet.h"
 
@@ -137,7 +137,7 @@
   }
 
   virtual void Cancel (void) {
-    assert (false);
+    NS_ASSERT (false);
   }
 
 private:
@@ -394,9 +394,9 @@
         }
       bool found;
       m_currentPacket = m_queue->Dequeue (&m_currentHdr, &found);
-      assert (found);
+      NS_ASSERT (found);
       m_hasCurrent = true;
-      assert (m_hasCurrent);
+      NS_ASSERT (m_hasCurrent);
       uint16_t sequence = m_txMiddle->GetNextSequenceNumberfor (&m_currentHdr);
       m_currentHdr.SetSequenceNumber (sequence);
       m_currentHdr.SetFragmentNumber (0);

--- a/src/devices/wifi/mac-low.cc	Tue Oct 16 15:43:26 2007 +0200
+++ b/src/devices/wifi/mac-low.cc	Tue Oct 16 15:57:45 2007 +0200
@@ -19,7 +19,7 @@
  * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
  */
 
-#include <cassert>
+#include "ns3/assert.h"
 
 #include "ns3/packet.h"
 #include "ns3/simulator.h"
@@ -207,7 +207,7 @@
 Time
 MacLowTransmissionParameters::GetDurationId (void) const
 {
-  assert (m_overrideDurationId != Seconds (0));
+  NS_ASSERT (m_overrideDurationId != Seconds (0));
   return m_overrideDurationId;
 }
 bool 
@@ -218,7 +218,7 @@
 uint32_t 
 MacLowTransmissionParameters::GetNextPacketSize (void) const
 {
-  assert (HasNextPacket ());
+  NS_ASSERT (HasNextPacket ());
   return m_nextSize;
 }
 
@@ -366,7 +366,7 @@
   m_listener = listener;
   m_txParams = parameters;
 
-  //assert (m_phy->IsStateIdle ());
+  //NS_ASSERT (m_phy->IsStateIdle ());
 
   TRACE ("startTx size="<< GetCurrentSize () << ", to=" << m_currentHdr.GetAddr1());
 
@@ -380,7 +380,7 @@
     }
 
   /* When this method completes, we have taken ownership of the medium. */
-  assert (m_phy->IsStateTx ());  
+  NS_ASSERT (m_phy->IsStateTx ());  
 }
 
 void
@@ -390,7 +390,7 @@
   m_dropError (packet);
   if (m_txParams.MustWaitFastAck ()) 
     {
-      assert (m_fastAckFailedTimeoutEvent.IsExpired ());
+      NS_ASSERT (m_fastAckFailedTimeoutEvent.IsExpired ());
       m_fastAckFailedTimeoutEvent = Simulator::Schedule (GetSifs (), 
                                                          &MacLow::FastAckFailedTimeout, this);
     }
@@ -418,7 +418,7 @@
           hdr.GetAddr1 () == m_device->GetSelfAddress ()) 
         {
           TRACE ("rx RTS from=" << hdr.GetAddr2 () << ", schedule CTS");
-          assert (m_sendCtsEvent.IsExpired ());
+          NS_ASSERT (m_sendCtsEvent.IsExpired ());
           MacStation *station = m_stations->Lookup (hdr.GetAddr2 ());
           station->ReportRxOk (rxSnr, txMode);
           m_sendCtsEvent = Simulator::Schedule (GetSifs (),
@@ -449,7 +449,7 @@
       
       m_ctsTimeoutEvent.Cancel ();
       m_listener->GotCts (rxSnr, txMode);
-      assert (m_sendDataEvent.IsExpired ());
+      NS_ASSERT (m_sendDataEvent.IsExpired ());
       m_sendDataEvent = Simulator::Schedule (GetSifs (), 
                                              &MacLow::SendDataAfterCts, this, 
                                              hdr.GetAddr1 (),
@@ -508,7 +508,7 @@
       else if (hdr.IsData () || hdr.IsMgt ()) 
         {
           TRACE ("rx unicast/sendAck from=" << hdr.GetAddr2 ());
-          assert (m_sendAckEvent.IsExpired ());
+          NS_ASSERT (m_sendAckEvent.IsExpired ());
           m_sendAckEvent = Simulator::Schedule (GetSifs (),
                                                 &MacLow::SendAckAfterData, this,
                                                 hdr.GetAddr2 (), 
@@ -661,7 +661,7 @@
    *
    * See section 9.9.2.2.1, 802.11e/D12.1
    */
-  assert (m_lastNavStart < at);
+  NS_ASSERT (m_lastNavStart < at);
   Time oldNavStart = m_lastNavStart;
   Time oldNavEnd = oldNavStart + m_lastNavDuration;
   Time newNavStart = at;
@@ -797,7 +797,7 @@
   Time txDuration = m_phy->CalculateTxDuration (GetRtsSize (), rtsTxMode, WIFI_PREAMBLE_LONG);
   Time timerDelay = txDuration + GetCtsTimeout ();
 
-  assert (m_ctsTimeoutEvent.IsExpired ());
+  NS_ASSERT (m_ctsTimeoutEvent.IsExpired ());
   m_ctsTimeoutEvent = Simulator::Schedule (timerDelay, &MacLow::CtsTimeout, this);
 
   Packet packet;
@@ -816,26 +816,26 @@
   if (m_txParams.MustWaitNormalAck ()) 
     {
       Time timerDelay = txDuration + GetAckTimeout ();
-      assert (m_normalAckTimeoutEvent.IsExpired ());
+      NS_ASSERT (m_normalAckTimeoutEvent.IsExpired ());
       m_normalAckTimeoutEvent = Simulator::Schedule (timerDelay, &MacLow::NormalAckTimeout, this);
     } 
   else if (m_txParams.MustWaitFastAck ()) 
     {
       Time timerDelay = txDuration + GetPifs ();
-      assert (m_fastAckTimeoutEvent.IsExpired ());
+      NS_ASSERT (m_fastAckTimeoutEvent.IsExpired ());
       m_fastAckTimeoutEvent = Simulator::Schedule (timerDelay, &MacLow::FastAckTimeout, this);
     } 
   else if (m_txParams.MustWaitSuperFastAck ()) 
     {
       Time timerDelay = txDuration + GetPifs ();
-      assert (m_superFastAckTimeoutEvent.IsExpired ());
+      NS_ASSERT (m_superFastAckTimeoutEvent.IsExpired ());
       m_superFastAckTimeoutEvent = Simulator::Schedule (timerDelay, 
                                                         &MacLow::SuperFastAckTimeout, this);
     } 
   else if (m_txParams.HasNextPacket ()) 
     {
       Time delay = txDuration + GetSifs ();
-      assert (m_waitSifsEvent.IsExpired ());
+      NS_ASSERT (m_waitSifsEvent.IsExpired ());
       m_waitSifsEvent = Simulator::Schedule (delay, &MacLow::WaitSifsAfterEndTx, this);
     } 
   else 
@@ -944,7 +944,7 @@
   /* send the third step in a 
    * RTS/CTS/DATA/ACK hanshake 
    */
-  assert (m_hasCurrent);
+  NS_ASSERT (m_hasCurrent);
   WifiMode dataTxMode = GetDataTxMode (m_currentHdr.GetAddr1 (), GetCurrentSize ());
 
   TRACE ("tx " << m_currentHdr.GetTypeString () << " to=" << m_currentHdr.GetAddr2 () <<

--- a/src/devices/wifi/mac-parameters.cc	Tue Oct 16 15:43:26 2007 +0200
+++ b/src/devices/wifi/mac-parameters.cc	Tue Oct 16 15:57:45 2007 +0200
@@ -19,7 +19,7 @@
  * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
  */
 
-#include <cassert>
+#include "ns3/assert.h"
 #include "mac-parameters.h"
 #include "wifi-default-parameters.h"
 
@@ -125,7 +125,7 @@
 uint32_t 
 MacParameters::GetFragmentationThreshold (void) const
 {
-  assert (GetMaxMsduSize () / 16 < m_fragmentationThreshold);
+  NS_ASSERT (GetMaxMsduSize () / 16 < m_fragmentationThreshold);
   return m_fragmentationThreshold;
 }
 Time

--- a/src/devices/wifi/mac-rx-middle.cc	Tue Oct 16 15:43:26 2007 +0200
+++ b/src/devices/wifi/mac-rx-middle.cc	Tue Oct 16 15:57:45 2007 +0200
@@ -22,7 +22,7 @@
 #include "ns3/packet.h"
 #include "wifi-mac-header.h"
 
-#include <cassert>
+#include "ns3/assert.h"
 #include <list>
 
 #define noRX_MIDDLE_TRACE 1
@@ -63,12 +63,12 @@
     return m_defragmenting;
   }
   void AccumulateFirstFragment (Packet const packet) {
-    assert (!m_defragmenting);
+    NS_ASSERT (!m_defragmenting);
     m_defragmenting = true;
     m_fragments.push_back (packet);
   }
   Packet AccumulateLastFragment (Packet const packet) {
-    assert (m_defragmenting);
+    NS_ASSERT (m_defragmenting);
     m_fragments.push_back (packet);
     m_defragmenting = false;
     Packet full;
@@ -80,7 +80,7 @@
     return full;
   }
   void AccumulateFragment (Packet const packet) {
-    assert (m_defragmenting);
+    NS_ASSERT (m_defragmenting);
     m_fragments.push_back (packet);
   }
   bool IsNextFragment (uint16_t sequenceControl) {
@@ -268,7 +268,7 @@
   OriginatorRxStatus *originator = Lookup (hdr);
   if (hdr->IsData ()) 
     {
-      assert (SequenceControlSmaller (originator->GetLastSequenceControl (), 
+      NS_ASSERT (SequenceControlSmaller (originator->GetLastSequenceControl (), 
                                       hdr->GetSequenceControl ()));
       // filter duplicates.
       if (IsDuplicate (hdr, originator)) 

--- a/src/devices/wifi/mac-tx-middle.cc	Tue Oct 16 15:43:26 2007 +0200
+++ b/src/devices/wifi/mac-tx-middle.cc	Tue Oct 16 15:57:45 2007 +0200
@@ -18,7 +18,7 @@
  * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
  */
 
-#include <cassert>
+#include "ns3/assert.h"
 
 #include "mac-tx-middle.h"
 #include "wifi-mac-header.h"
@@ -42,7 +42,7 @@
       !hdr->GetAddr1 ().IsBroadcast ()) 
     {
       uint8_t tid = hdr->GetQosTid ();
-      assert (tid < 16);
+      NS_ASSERT (tid < 16);
       retval = m_qosSequences[tid];
       m_qosSequences[tid]++;
       m_qosSequences[tid] %= 4096;

--- a/src/devices/wifi/ssid.cc	Tue Oct 16 15:43:26 2007 +0200
+++ b/src/devices/wifi/ssid.cc	Tue Oct 16 15:57:45 2007 +0200
@@ -19,7 +19,7 @@
  * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
  */
 #include "ssid.h"
-#include <cassert>
+#include "ns3/assert.h"
 
 #define ELEMENT_ID (0)
 
@@ -50,7 +50,7 @@
 }
 Ssid::Ssid (char const ssid[32], uint8_t length)
 {
-  assert (length <= 32);
+  NS_ASSERT (length <= 32);
   uint8_t len = 0;
   while (len < length) 
     {
@@ -96,7 +96,7 @@
     {
       size++;
     }
-  assert (size <= 32);
+  NS_ASSERT (size <= 32);
   return size;
 }
 

--- a/src/devices/wifi/wifi-mac-header.cc	Tue Oct 16 15:43:26 2007 +0200
+++ b/src/devices/wifi/wifi-mac-header.cc	Tue Oct 16 15:57:45 2007 +0200
@@ -18,7 +18,7 @@
  *
  * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
  */
-#include <cassert>
+#include "ns3/assert.h"
 #include "ns3/address-utils.h"
 #include "wifi-mac-header.h"
 
@@ -262,7 +262,7 @@
 void 
 WifiMacHeader::SetDurationUs (uint64_t duration_us)
 {
-  assert (duration_us <= (1<<16) - 1);
+  NS_ASSERT (duration_us <= (1<<16) - 1);
   m_duration = static_cast<uint16_t> (duration_us);
 }
 
@@ -433,7 +433,7 @@
     break;
   }
   // NOTREACHED
-  assert (false);
+  NS_ASSERT (false);
   return (enum WifiMacType_e)-1;
 }
 bool 
@@ -592,31 +592,31 @@
 bool 
 WifiMacHeader::IsQosBlockAck (void) const
 {
-  assert (IsQosData ());
+  NS_ASSERT (IsQosData ());
   return (m_qosAckPolicy == 3)?true:false;
 }
 bool 
 WifiMacHeader::IsQosNoAck (void) const
 {
-  assert (IsQosData ());
+  NS_ASSERT (IsQosData ());
   return (m_qosAckPolicy == 1)?true:false;
 }
 bool 
 WifiMacHeader::IsQosAck (void) const
 {
-  assert (IsQosData ());
+  NS_ASSERT (IsQosData ());
   return (m_qosAckPolicy == 0)?true:false;
 }
 uint8_t
 WifiMacHeader::GetQosTid (void) const
 {
-  assert (IsQosData ());
+  NS_ASSERT (IsQosData ());
   return m_qosTid;
 }
 uint8_t 
 WifiMacHeader::GetQosTxopLimit (void) const
 {
-  assert (IsQosData ());
+  NS_ASSERT (IsQosData ());
   return m_qosStuff;
 }
 
@@ -704,7 +704,7 @@
     case SUBTYPE_CTL_BACKREQ:
     case SUBTYPE_CTL_BACKRESP:
       // NOT IMPLEMENTED
-      assert (false);
+      NS_ASSERT (false);
       break;
     }
     break;
@@ -897,11 +897,11 @@
     case SUBTYPE_CTL_BACKREQ:
     case SUBTYPE_CTL_BACKRESP:
       // NOT IMPLEMENTED
-      assert (false);
+      NS_ASSERT (false);
       break;
     default:
       //NOTREACHED
-      assert (false);
+      NS_ASSERT (false);
       break;
     }
     break;
@@ -918,7 +918,7 @@
     } break;
   default:
     //NOTREACHED
-    assert (false);
+    NS_ASSERT (false);
     break;
   }
 }
@@ -947,7 +947,7 @@
     case SUBTYPE_CTL_BACKREQ:
     case SUBTYPE_CTL_BACKRESP:
       // NOT IMPLEMENTED
-      assert (false);
+      NS_ASSERT (false);
       break;
     }
     break;

--- a/src/devices/wifi/wifi-mac-trailer.cc	Tue Oct 16 15:43:26 2007 +0200
+++ b/src/devices/wifi/wifi-mac-trailer.cc	Tue Oct 16 15:57:45 2007 +0200
@@ -19,7 +19,7 @@
  * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
  */
 #include "wifi-mac-trailer.h"
-#include <cassert>
+#include "ns3/assert.h"
 
 namespace ns3 {
 

--- a/src/devices/wifi/wifi-phy.cc	Tue Oct 16 15:43:26 2007 +0200
+++ b/src/devices/wifi/wifi-phy.cc	Tue Oct 16 15:57:45 2007 +0200
@@ -29,7 +29,7 @@
 #include "ns3/packet.h"
 #include "ns3/random-variable.h"
 
-#include <cassert>
+#include "ns3/assert.h"
 #include <math.h>
 
 
@@ -289,7 +289,7 @@
         NotifySyncStart (rxDuration);
         SwitchToSync (rxDuration);
         m_startSyncLogger (rxDuration, rxPowerW);
-        assert (m_endSyncEvent.IsExpired ());
+        NS_ASSERT (m_endSyncEvent.IsExpired ());
         m_endSyncEvent = Simulator::Schedule (rxDuration, &WifiPhy::EndSync, this, 
                                               packet,
                                               event);
@@ -348,7 +348,7 @@
    *    prevent it.
    *  - we are idle
    */
-  assert (!IsStateTx ());
+  NS_ASSERT (!IsStateTx ());
 
   if (IsStateSync ()) {
     m_endSyncEvent.Cancel ();
@@ -386,7 +386,7 @@
   precision = 1e-12;
   while (high - low > precision) 
     {
-      assert (high >= low);
+      NS_ASSERT (high >= low);
       double middle = low + (high - low) / 2;
       if ((1 - GetChunkSuccessRate (txMode, middle, 1)) > ber) 
         {
@@ -489,7 +489,7 @@
     retval = Seconds (0);
     break;
   default:
-    assert (false);
+    NS_ASSERT (false);
     // NOTREACHED
     retval = Seconds (0);
     break;
@@ -589,8 +589,8 @@
 double 
 WifiPhy::GetPowerDbm (uint8_t power) const
 {
-  assert (m_txPowerBaseDbm <= m_txPowerEndDbm);
-  assert (m_nTxPower > 0);
+  NS_ASSERT (m_txPowerBaseDbm <= m_txPowerEndDbm);
+  NS_ASSERT (m_nTxPower > 0);
   double dbm = m_txPowerBaseDbm + (m_txPowerEndDbm - m_txPowerBaseDbm) / m_nTxPower;
   return dbm;
 }
@@ -637,7 +637,7 @@
   Time now = Simulator::Now ();
   Time idleStart = Max (m_endCcaBusy, m_endSync);
   idleStart = Max (idleStart, m_endTx);
-  assert (idleStart <= now);
+  NS_ASSERT (idleStart <= now);
   if (m_endCcaBusy > m_endSync && 
       m_endCcaBusy > m_endTx) {
     Time ccaBusyStart = Max (m_endTx, m_endSync);
@@ -668,7 +668,7 @@
     LogPreviousIdleAndCcaBusyStates ();
     break;
   default:
-    assert (false);
+    NS_ASSERT (false);
     break;
   }
   m_stateLogger (now, txDuration, 0);
@@ -679,8 +679,8 @@
 void
 WifiPhy::SwitchToSync (Time rxDuration)
 {
-  assert (IsStateIdle () || IsStateCcaBusy ());
-  assert (!m_syncing);
+  NS_ASSERT (IsStateIdle () || IsStateCcaBusy ());
+  NS_ASSERT (!m_syncing);
   Time now = Simulator::Now ();
   switch (GetState ()) {
   case WifiPhy::IDLE:
@@ -693,27 +693,27 @@
   } break;
   case WifiPhy::SYNC:
   case WifiPhy::TX:
-    assert (false);
+    NS_ASSERT (false);
     break;
   }
   m_previousStateChangeTime = now;
   m_syncing = true;
   m_startSync = now;
   m_endSync = now + rxDuration;
-  assert (IsStateSync ());
+  NS_ASSERT (IsStateSync ());
 }
 void
 WifiPhy::SwitchFromSync (void)
 {
-  assert (IsStateSync ());
-  assert (m_syncing);
+  NS_ASSERT (IsStateSync ());
+  NS_ASSERT (m_syncing);
 
   Time now = Simulator::Now ();
   m_stateLogger (m_startSync, now - m_startSync, 1);
   m_previousStateChangeTime = now;
   m_syncing = false;
 
-  assert (IsStateIdle () || IsStateCcaBusy ());
+  NS_ASSERT (IsStateIdle () || IsStateCcaBusy ());
 }
 void
 WifiPhy::SwitchMaybeToCcaBusy (Time duration)
@@ -1094,7 +1094,7 @@
   while (ni->end () != j) 
     {
       Time current = (*j).GetTime ();
-      assert (current >= previous);
+      NS_ASSERT (current >= previous);
     
       if (previous >= plcpPayloadStart) 
         {
@@ -1121,7 +1121,7 @@
             } 
           else 
             {
-              assert (current >= plcpHeaderStart);
+              NS_ASSERT (current >= plcpHeaderStart);
               psr *= CalculateChunkSuccessRate (CalculateSnr (powerW, 
                                                               noiseInterferenceW, 
                                                               headerMode), 
@@ -1167,8 +1167,8 @@
 void
 WifiPhy::EndSync (Packet const packet, Ptr<RxEvent> event)
 {
-  assert (IsStateSync ());
-  assert (event->GetEndTime () == Simulator::Now ());
+  NS_ASSERT (IsStateSync ());
+  NS_ASSERT (event->GetEndTime () == Simulator::Now ());
 
   NiChanges ni;
   double noiseInterferenceW = CalculateNoiseInterferenceW (event, &ni);