Attachment #369 for bug #486

View | Details | Raw Unified | Return to bug 486
Collapse All | Expand All

(-)a/examples/csma-star.cc (+1 lines)

Lines 19-24	Link Here

#include "ns3/simulator-module.h"

#include "ns3/simulator-module.h"

#include "ns3/node-module.h"

#include "ns3/node-module.h"

#include "ns3/helper-module.h"

#include "ns3/helper-module.h"

#include "ns3/csma-module.h"

#include "ns3/global-route-manager.h"

#include "ns3/global-route-manager.h"

// Network topology (default)

// Network topology (default)

(-)a/examples/emu-udp-echo.cc (+1 lines)

Lines 65-70	Link Here

#include "ns3/core-module.h"

#include "ns3/core-module.h"

#include "ns3/simulator-module.h"

#include "ns3/simulator-module.h"

#include "ns3/helper-module.h"

#include "ns3/helper-module.h"

#include "ns3/emu-helper.h"

using namespace ns3;

using namespace ns3;

(-)a/src/common/packet-metadata-test.cc (-1 lines)

Lines 178-184 class HistoryTrailer : public HistoryTra	Link Here

178

179

public:

179

public:

180

  HistoryTrailer ();

180

  HistoryTrailer ();

181

  bool IsOk (void) const;

182

181

183

  static TypeId GetTypeId (void);

182

  static TypeId GetTypeId (void);

184

  virtual TypeId GetInstanceTypeId (void) const;

183

  virtual TypeId GetInstanceTypeId (void) const;





template <typename T>
Ptr<T> 
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 (-1 / +1 lines)

Lines 58-64 void	Link Here

PointToPointChannel::Attach(Ptr<PointToPointNetDevice> device)

PointToPointChannel::Attach(Ptr<PointToPointNetDevice> device)

  NS_LOG_FUNCTION (this << 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);

  NS_ASSERT(device != 0);

  m_link[m_nDevices++].m_src = device;

  m_link[m_nDevices++].m_src = device;

(-)a/src/devices/wifi/rraa-wifi-manager.cc (-1 / +1 lines)

Lines 400-406 RraaWifiManager::GetThresholds (WifiMode	Link Here

400

    return mode6;

400

    return mode6;

401

  } break;

401

  } break;

402

403

  NS_ASSERT("Thresholds for an unknown mode are asked");

403

  NS_ASSERT_MSG(false, "Thresholds for an unknown mode are asked");

404

  return ThresholdsItem ();

404

  return ThresholdsItem ();

405

406

(-)a/src/internet-stack/ipv4-l3-protocol.cc (-2 / +2 lines)

Lines 1068-1075 Ipv4L3Protocol::SetUp (uint32_t i)	Link Here

1068

  // If interface address and network mask have been set, add a route

1068

  // If interface address and network mask have been set, add a route

1069

  // to the network of the interface (like e.g. ifconfig does on a

1069

  // to the network of the interface (like e.g. ifconfig does on a

1070

  // Linux box)

1070

  // Linux box)

1071

  if ((interface->GetAddress ()) != (Ipv4Address ())

1071

  if ( ! interface->GetAddress ().IsEqual (Ipv4Address ())

1072

      && (interface->GetNetworkMask ()) != (Ipv4Mask ()))

1072

       && (interface->GetNetworkMask ()) != (Ipv4Mask ()))

1073

1074

      AddNetworkRouteTo (interface->GetAddress ().CombineMask (interface->GetNetworkMask ()),

1074

      AddNetworkRouteTo (interface->GetAddress ().CombineMask (interface->GetNetworkMask ()),

1075

                         interface->GetNetworkMask (), i);

1075

                         interface->GetNetworkMask (), i);

(-)a/src/node/queue.cc (-3 / +3 lines)

Lines 84-95 Queue::Dequeue (void)	Link Here

  if (packet != 0)

  if (packet != 0)

      NS_ASSERT (m_nBytes >= packet->GetSize ());

      NS_ASSERT (m_nPackets > 0);

      m_nBytes -= packet->GetSize ();

      m_nBytes -= packet->GetSize ();

      m_nPackets--;

      m_nPackets--;

      NS_ASSERT (m_nBytes >= 0);

      NS_ASSERT (m_nPackets >= 0);

      NS_LOG_LOGIC("m_traceDequeue (packet)");

      NS_LOG_LOGIC("m_traceDequeue (packet)");

      m_traceDequeue (packet);

      m_traceDequeue (packet);

(-)a/src/routing/olsr/olsr-header.cc (-1 lines)

Lines 303-309 MessageHeader::Mid::Deserialize (Buffer:	Link Here

303

  Buffer::Iterator i = start;

303

  Buffer::Iterator i = start;

304

305

  this->interfaceAddresses.clear ();

305

  this->interfaceAddresses.clear ();

306

  NS_ASSERT (messageSize >= 0);

307

  NS_ASSERT (messageSize % IPV4_ADDRESS_SIZE == 0);

306

  NS_ASSERT (messageSize % IPV4_ADDRESS_SIZE == 0);

308

307

309

  int numAddresses = messageSize / IPV4_ADDRESS_SIZE;

308

  int numAddresses = messageSize / IPV4_ADDRESS_SIZE;

(-)a/src/simulator/time.cc (-5 / +5 lines)

Lines 32-42 namespace ns3 {	Link Here

namespace TimeStepPrecision {

namespace TimeStepPrecision {

static const uint64_t MS_FACTOR = (uint64_t)pow(10,3);

static const uint64_t MS_FACTOR = (uint64_t)1000;

static const uint64_t US_FACTOR = (uint64_t)pow(10,6);

static const uint64_t US_FACTOR = (uint64_t)1000000;

static const uint64_t NS_FACTOR = (uint64_t)pow(10,9);

static const uint64_t NS_FACTOR = (uint64_t)1000000 * (uint64_t)1000;

static const uint64_t PS_FACTOR = (uint64_t)pow(10,12);

static const uint64_t PS_FACTOR = (uint64_t)1000000 * (uint64_t)1000000;

static const uint64_t FS_FACTOR = (uint64_t)pow(10,15);

static const uint64_t FS_FACTOR = (uint64_t)1000000 * (uint64_t)1000000 * (uint64_t)1000;

static uint64_t g_tsPrecFactor = NS_FACTOR;

static uint64_t g_tsPrecFactor = NS_FACTOR;

static GlobalValue g_precisionDefaultValue ("TimeStepPrecision",

static GlobalValue g_precisionDefaultValue ("TimeStepPrecision",

Return to bug 486