From 3326fdba359cd52008f969fe4f9f75e7f8901621 Mon Sep 17 00:00:00 2001
From: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
Date: Mon, 19 Feb 2007 10:23:50 +0100
Subject: [PATCH] use new NS_ASSERT macro rather than assert. this makes the
 code build on my machine.

---
 samples/main-channel.cc     |  7 ++++---
 src/node/layer-connector.cc | 11 ++++++-----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/samples/main-channel.cc b/samples/main-channel.cc
index 21548150e..ffb83ae84 100644
--- a/samples/main-channel.cc
+++ b/samples/main-channel.cc
@@ -19,6 +19,7 @@
 
 #include <string>
 #include "ns3/debug.h"
+#include "ns3/assert.h"
 #include "ns3/packet.h"
 #include "ns3/drop-tail.h"
 #include "ns3/layer-connector.h"
@@ -123,14 +124,14 @@ FakePhysicalLayer::LowerDoNotify (LayerConnectorUpper *upper)
 
   NS_DEBUG_UNCOND("FakePhysicalLayer::LowerDoNotify (): Starting pull")
 
-  assert(m_upperPartner);
+  NS_ASSERT(m_upperPartner);
   m_upperPartner->UpperPull(p);
 
   m_dtqOutbound.Enque(p);
 
   NS_DEBUG_UNCOND("FakePhysicalLayer::LowerDoNotify (): Got bits,  Notify lower")
 
-  assert(m_lowerPartner);
+  NS_ASSERT(m_lowerPartner);
   return m_lowerPartner->LowerNotify(this);
 }
 
@@ -139,7 +140,7 @@ FakePhysicalLayer::UpperDoSendUp (Packet &p)
 {
   NS_DEBUG_UNCOND("FakePhysicalLayer::UpperDoSendUp (" << &p << ")")
 
-  assert(m_upperPartner);
+  NS_ASSERT(m_upperPartner);
   return m_upperPartner->UpperSendUp(p);
 }
 
diff --git a/src/node/layer-connector.cc b/src/node/layer-connector.cc
index 6b6232815..37ff55dc1 100644
--- a/src/node/layer-connector.cc
+++ b/src/node/layer-connector.cc
@@ -22,6 +22,7 @@
  */
 
 #include "ns3/debug.h"
+#include "ns3/assert.h"
 #include "layer-connector.h"
 
 NS_DEBUG_COMPONENT_DEFINE ("LayerConnector");
@@ -52,7 +53,7 @@ LayerConnectorUpper::DoConnectToLower (LayerConnectorLower &partner)
   NS_DEBUG("LayerConnectorUpper::DoConnectToLower (" << &partner << ")")
 
   m_lowerPartner = &partner;
-  assert(m_lowerPartner);
+  NS_ASSERT (m_lowerPartner);
   return true;
 }
 
@@ -77,7 +78,7 @@ LayerConnectorUpper::UpperNotify ()
 {
   NS_DEBUG("LayerConnectorUpper::UpperNotify ()")
 
-  assert(m_lowerPartner);
+  NS_ASSERT (m_lowerPartner);
   return m_lowerPartner->LowerNotify(this);
 }
 
@@ -105,7 +106,7 @@ LayerConnectorLower::DoConnectToUpper (LayerConnectorUpper &partner)
   NS_DEBUG("LayerConnectorLower::DoConnectToUpper (" << &partner << ")")
 
   m_upperPartner = &partner;
-  assert(m_upperPartner);
+  NS_ASSERT (m_upperPartner);
   return true;
 }
 
@@ -114,7 +115,7 @@ LayerConnectorLower::LowerSendUp (Packet &p)
 {
   NS_DEBUG("LayerConnectorLower::LowerSendUp (" << &p << ")")
 
-  assert(m_upperPartner);
+  NS_ASSERT (m_upperPartner);
   return m_upperPartner->UpperSendUp(p);
 }
 
@@ -123,7 +124,7 @@ LayerConnectorLower::LowerPull (Packet &p)
 {
   NS_DEBUG("LayerConnectorLower::LowerPull (" << &p << ")")
 
-  assert(m_upperPartner);
+  NS_ASSERT (m_upperPartner);
   return m_upperPartner->UpperPull(p);
 }