From fc07a2195e13acdb86f185a7ce85e8cddc620ee7 Mon Sep 17 00:00:00 2001
From: John Abraham <john.abraham.in@gmail.com>
Date: Thu, 11 Jul 2013 09:27:37 -0700
Subject: [PATCH] DSDV: Modify rarely-used keywords to comply with other
 compilers

---
 src/dsdv/model/dsdv-routing-protocol.cc | 10 +++++-----
 src/dsdv/model/dsdv-rtable.cc           |  4 ++--
 src/dsdv/model/dsdv-rtable.h            |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/dsdv/model/dsdv-routing-protocol.cc b/src/dsdv/model/dsdv-routing-protocol.cc
index 07c4c5f10..bb98f481c 100644
--- a/src/dsdv/model/dsdv-routing-protocol.cc
+++ b/src/dsdv/model/dsdv-routing-protocol.cc
@@ -691,7 +691,7 @@ RoutingProtocol::RecvDsdv (Ptr<Socket> socket)
                       /*Received update with same seq number but with same or greater hop count.
                        * Discard that update.
                        */
-                      if (not m_advRoutingTable.AnyRunningEvent (dsdvHeader.GetDst ()))
+                      if (!m_advRoutingTable.AnyRunningEvent (dsdvHeader.GetDst ()))
                         {
                           /*update the timer only if nexthop address matches thus discarding
                            * updates to that destination from other nodes.
@@ -711,7 +711,7 @@ RoutingProtocol::RecvDsdv (Ptr<Socket> socket)
               else
                 {
                   // Received update with an old sequence number. Discard the update
-                  if (not m_advRoutingTable.AnyRunningEvent (dsdvHeader.GetDst ()))
+                  if (!m_advRoutingTable.AnyRunningEvent (dsdvHeader.GetDst ()))
                     {
                       m_advRoutingTable.DeleteRoute (dsdvHeader.GetDst ());
                     }
@@ -743,7 +743,7 @@ RoutingProtocol::RecvDsdv (Ptr<Socket> socket)
                 }
               else
                 {
-                  if (not m_advRoutingTable.AnyRunningEvent (dsdvHeader.GetDst ()))
+                  if (!m_advRoutingTable.AnyRunningEvent (dsdvHeader.GetDst ()))
                     {
                       m_advRoutingTable.DeleteRoute (dsdvHeader.GetDst ());
                     }
@@ -786,7 +786,7 @@ RoutingProtocol::SendTriggeredUpdate ()
                                         << " SeqNo:" << i->second.GetSeqNo () << " HopCount:"
                                         << i->second.GetHop () + 1);
           RoutingTableEntry temp = i->second;
-          if ((i->second.GetEntriesChanged () == true) && (not m_advRoutingTable.AnyRunningEvent (temp.GetDestination ())))
+          if ((i->second.GetEntriesChanged () == true) && (!m_advRoutingTable.AnyRunningEvent (temp.GetDestination ())))
             {
               dsdvHeader.SetDst (i->second.GetDestination ());
               dsdvHeader.SetDstSeqno (i->second.GetSeqNo ());
@@ -1189,7 +1189,7 @@ RoutingProtocol::MergeTriggerPeriodicUpdates ()
       for (std::map<Ipv4Address, RoutingTableEntry>::const_iterator i = allRoutes.begin (); i != allRoutes.end (); ++i)
         {
           RoutingTableEntry advEntry = i->second;
-          if ((advEntry.GetEntriesChanged () == true) && (not m_advRoutingTable.AnyRunningEvent (advEntry.GetDestination ())))
+          if ((advEntry.GetEntriesChanged () == true) && (!m_advRoutingTable.AnyRunningEvent (advEntry.GetDestination ())))
             {
               if (!(advEntry.GetSeqNo () % 2))
                 {
diff --git a/src/dsdv/model/dsdv-rtable.cc b/src/dsdv/model/dsdv-rtable.cc
index 98ec10894..7b2653f83 100644
--- a/src/dsdv/model/dsdv-rtable.cc
+++ b/src/dsdv/model/dsdv-rtable.cc
@@ -39,9 +39,9 @@ namespace ns3 {
 namespace dsdv {
 RoutingTableEntry::RoutingTableEntry (Ptr<NetDevice> dev,
                                       Ipv4Address dst,
-                                      u_int32_t seqNo,
+                                      uint32_t seqNo,
                                       Ipv4InterfaceAddress iface,
-                                      u_int32_t hops,
+                                      uint32_t hops,
                                       Ipv4Address nextHop,
                                       Time lifetime,
                                       Time SettlingTime,
diff --git a/src/dsdv/model/dsdv-rtable.h b/src/dsdv/model/dsdv-rtable.h
index 08c0e8652..0be6e08dc 100644
--- a/src/dsdv/model/dsdv-rtable.h
+++ b/src/dsdv/model/dsdv-rtable.h
@@ -57,8 +57,8 @@ class RoutingTableEntry
 {
 public:
   /// c-tor
-  RoutingTableEntry (Ptr<NetDevice> dev = 0, Ipv4Address dst = Ipv4Address (), u_int32_t m_seqNo = 0,
-                     Ipv4InterfaceAddress iface = Ipv4InterfaceAddress (), u_int32_t hops = 0, Ipv4Address nextHop = Ipv4Address (),
+  RoutingTableEntry (Ptr<NetDevice> dev = 0, Ipv4Address dst = Ipv4Address (), uint32_t m_seqNo = 0,
+                     Ipv4InterfaceAddress iface = Ipv4InterfaceAddress (), uint32_t hops = 0, Ipv4Address nextHop = Ipv4Address (),
                      Time lifetime = Simulator::Now (), Time SettlingTime = Simulator::Now (), bool changedEntries = false);
 
   ~RoutingTableEntry ();