--- a/examples/csma-star.cc	Tue Feb 24 08:20:51 2009 +0100
+++ b/examples/csma-star.cc	Tue Feb 24 08:29:36 2009 +0100
@@ -19,6 +19,7 @@
 #include "ns3/simulator-module.h"
 #include "ns3/node-module.h"
 #include "ns3/helper-module.h"
+#include "ns3/csma-module.h"
 #include "ns3/global-route-manager.h"
 
 // Network topology (default)

--- a/examples/emu-udp-echo.cc	Tue Feb 24 08:20:51 2009 +0100
+++ b/examples/emu-udp-echo.cc	Tue Feb 24 08:29:36 2009 +0100
@@ -65,6 +65,7 @@
 #include "ns3/core-module.h"
 #include "ns3/simulator-module.h"
 #include "ns3/helper-module.h"
+#include "ns3/emu-helper.h"
 
 using namespace ns3;
 

--- a/src/common/packet-metadata-test.cc	Tue Feb 24 08:20:51 2009 +0100
+++ b/src/common/packet-metadata-test.cc	Tue Feb 24 08:29:36 2009 +0100
@@ -178,7 +178,6 @@
 {
 public:
   HistoryTrailer ();
-  bool IsOk (void) const;
 
   static TypeId GetTypeId (void);
   virtual TypeId GetInstanceTypeId (void) const;

--- a/src/core/object.h	Tue Feb 24 08:20:51 2009 +0100
+++ b/src/core/object.h	Tue Feb 24 08:29:36 2009 +0100
@@ -403,15 +403,15 @@
 
 template <typename T>
 Ptr<T> 
-CreateObject (std::string n1 = "", const AttributeValue & v1 = EmptyAttributeValue (),
-              std::string n2 = "", const AttributeValue & v2 = EmptyAttributeValue (),
-              std::string n3 = "", const AttributeValue & v3 = EmptyAttributeValue (),
-              std::string n4 = "", const AttributeValue & v4 = EmptyAttributeValue (),
-              std::string n5 = "", const AttributeValue & v5 = EmptyAttributeValue (),
-              std::string n6 = "", const AttributeValue & v6 = EmptyAttributeValue (),
-              std::string n7 = "", const AttributeValue & v7 = EmptyAttributeValue (),
-              std::string n8 = "", const AttributeValue & v8 = EmptyAttributeValue (),
-              std::string n9 = "", const AttributeValue & v9 = EmptyAttributeValue ())
+CreateObject (std::string n1 , const AttributeValue & v1,
+              std::string n2 , const AttributeValue & v2,
+              std::string n3 , const AttributeValue & v3,
+              std::string n4 , const AttributeValue & v4,
+              std::string n5 , const AttributeValue & v5,
+              std::string n6 , const AttributeValue & v6,
+              std::string n7 , const AttributeValue & v7,
+              std::string n8 , const AttributeValue & v8,
+              std::string n9 , const AttributeValue & v9)
 {
   AttributeList attributes;
   if (n1 == "")

--- a/src/devices/point-to-point/point-to-point-channel.cc	Tue Feb 24 08:20:51 2009 +0100
+++ b/src/devices/point-to-point/point-to-point-channel.cc	Tue Feb 24 08:29:36 2009 +0100
@@ -58,7 +58,7 @@
 PointToPointChannel::Attach(Ptr<PointToPointNetDevice> device)
 {
   NS_LOG_FUNCTION (this << device);
-  NS_ASSERT(m_nDevices < N_DEVICES && "Only two devices permitted");
+  NS_ASSERT_MSG(m_nDevices < N_DEVICES, "Only two devices permitted");
   NS_ASSERT(device != 0);
 
   m_link[m_nDevices++].m_src = device;

--- a/src/devices/wifi/rraa-wifi-manager.cc	Tue Feb 24 08:20:51 2009 +0100
+++ b/src/devices/wifi/rraa-wifi-manager.cc	Tue Feb 24 08:29:36 2009 +0100
@@ -400,7 +400,7 @@
     return mode6;
   } break;
   }
-  NS_ASSERT("Thresholds for an unknown mode are asked");
+  NS_ASSERT_MSG(false, "Thresholds for an unknown mode are asked");
   return ThresholdsItem ();
 }
 

--- a/src/internet-stack/ipv4-l3-protocol.cc	Tue Feb 24 08:20:51 2009 +0100
+++ b/src/internet-stack/ipv4-l3-protocol.cc	Tue Feb 24 08:29:36 2009 +0100
@@ -1068,7 +1068,7 @@
   // If interface address and network mask have been set, add a route
   // to the network of the interface (like e.g. ifconfig does on a
   // Linux box)
-  if ((interface->GetAddress ()) != (Ipv4Address ())
+  if (((interface->GetAddress ()) != (Ipv4Address ()))
       && (interface->GetNetworkMask ()) != (Ipv4Mask ()))
     {
       AddNetworkRouteTo (interface->GetAddress ().CombineMask (interface->GetNetworkMask ()),

--- a/src/node/queue.cc	Tue Feb 24 08:20:51 2009 +0100
+++ b/src/node/queue.cc	Tue Feb 24 08:29:36 2009 +0100
@@ -84,12 +84,12 @@
 
   if (packet != 0)
     {
+      NS_ASSERT (m_nBytes >= packet->GetSize ());
+      NS_ASSERT (m_nPackets > 0);
+
       m_nBytes -= packet->GetSize ();
       m_nPackets--;
 
-      NS_ASSERT (m_nBytes >= 0);
-      NS_ASSERT (m_nPackets >= 0);
-
       NS_LOG_LOGIC("m_traceDequeue (packet)");
 
       m_traceDequeue (packet);

--- a/src/routing/olsr/olsr-header.cc	Tue Feb 24 08:20:51 2009 +0100
+++ b/src/routing/olsr/olsr-header.cc	Tue Feb 24 08:29:36 2009 +0100
@@ -303,7 +303,6 @@
   Buffer::Iterator i = start;
 
   this->interfaceAddresses.clear ();
-  NS_ASSERT (messageSize >= 0);
   NS_ASSERT (messageSize % IPV4_ADDRESS_SIZE == 0);
   
   int numAddresses = messageSize / IPV4_ADDRESS_SIZE;

--- a/src/simulator/time.cc	Tue Feb 24 08:20:51 2009 +0100
+++ b/src/simulator/time.cc	Tue Feb 24 08:29:36 2009 +0100
@@ -32,11 +32,11 @@
 
 namespace TimeStepPrecision {
 
-static const uint64_t MS_FACTOR = (uint64_t)pow(10,3);
-static const uint64_t US_FACTOR = (uint64_t)pow(10,6);
-static const uint64_t NS_FACTOR = (uint64_t)pow(10,9);
-static const uint64_t PS_FACTOR = (uint64_t)pow(10,12);
-static const uint64_t FS_FACTOR = (uint64_t)pow(10,15);
+static const uint64_t MS_FACTOR = (uint64_t)1000;
+static const uint64_t US_FACTOR = (uint64_t)1000000;
+static const uint64_t NS_FACTOR = (uint64_t)1000000 * (uint64_t)1000;
+static const uint64_t PS_FACTOR = (uint64_t)1000000 * (uint64_t)1000000;
+static const uint64_t FS_FACTOR = (uint64_t)1000000 * (uint64_t)1000000 * (uint64_t)1000;
 static uint64_t g_tsPrecFactor = NS_FACTOR;
 
 static GlobalValue g_precisionDefaultValue ("TimeStepPrecision",