Attachment #1421 for bug #1470

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

(-)a/src/aodv/model/aodv-packet.cc (-1 / +1 lines)

Lines 36-42 namespace aodv	Link Here

NS_OBJECT_ENSURE_REGISTERED (TypeHeader);

NS_OBJECT_ENSURE_REGISTERED (TypeHeader);

TypeHeader::TypeHeader (MessageType t = AODVTYPE_RREQ) :

TypeHeader::TypeHeader (MessageType t/* = AODVTYPE_RREQ*/) :

  m_type (t), m_valid (true)

  m_type (t), m_valid (true)

(-)a/src/aodv/model/aodv-packet.h (-1 / +1 lines)

Lines 54-60 class TypeHeader : public Header	Link Here

public:

public:

  /// c-tor

  /// c-tor

  TypeHeader (MessageType t);

  TypeHeader (MessageType t = AODVTYPE_RREQ);

  ///\name Header serialization/deserialization

  ///\name Header serialization/deserialization

  //\{

  //\{

(-)a/src/dsdv/examples/dsdv-manet.cc (-1 / +1 lines)

Lines 155-161 DsdvManetExample::ReceivePacket (Ptr <Socket> socket)	Link Here

155

156

  NS_LOG_UNCOND (Simulator::Now ().GetSeconds () << " Received one packet!");

156

  NS_LOG_UNCOND (Simulator::Now ().GetSeconds () << " Received one packet!");

157

  Ptr <Packet> packet;

157

  Ptr <Packet> packet;

158

  while (packet = socket->Recv ())

158

  while ((packet = socket->Recv ()))

159

160

      bytesTotal += packet->GetSize ();

160

      bytesTotal += packet->GetSize ();

161

      packetsReceived += 1;

161

      packetsReceived += 1;

(-)a/src/flow-monitor/model/histogram.cc (-1 / +1 lines)

Lines 97-103 Histogram::Histogram (double binWidth)	Link Here

Histogram::Histogram ()

Histogram::Histogram ()

100

  Histogram (DEFAULT_BIN_WIDTH);

100

  m_binWidth = DEFAULT_BIN_WIDTH;

101

102

103

(-)a/src/lte/bindings/modulegen__gcc_ILP32.py (-4 lines)

Lines 7066-7075 def register_Ns3TraceFadingLossModel_methods(root_module, cls):	Link Here

7066

    cls.add_constructor([param('ns3::TraceFadingLossModel const &', 'arg0')])

7066

    cls.add_constructor([param('ns3::TraceFadingLossModel const &', 'arg0')])

7067

    ## trace-fading-loss-model.h (module 'lte'): ns3::TraceFadingLossModel::TraceFadingLossModel() [constructor]

7067

    ## trace-fading-loss-model.h (module 'lte'): ns3::TraceFadingLossModel::TraceFadingLossModel() [constructor]

7068

    cls.add_constructor([])

7068

    cls.add_constructor([])

7069

    ## trace-fading-loss-model.h (module 'lte'): void ns3::TraceFadingLossModel::CreateFadingChannelRealization(ns3::Ptr<const ns3::MobilityModel> enbMobility, ns3::Ptr<const ns3::MobilityModel> ueMobility) [member function]

7070

    cls.add_method('CreateFadingChannelRealization',

7071

                   'void',

7072

                   [param('ns3::Ptr< ns3::MobilityModel const >', 'enbMobility'), param('ns3::Ptr< ns3::MobilityModel const >', 'ueMobility')])

7073

    ## trace-fading-loss-model.h (module 'lte'): static ns3::TypeId ns3::TraceFadingLossModel::GetTypeId() [member function]

7069

    ## trace-fading-loss-model.h (module 'lte'): static ns3::TypeId ns3::TraceFadingLossModel::GetTypeId() [member function]

7074

    cls.add_method('GetTypeId',

7070

    cls.add_method('GetTypeId',

7075

                   'ns3::TypeId',

7071

                   'ns3::TypeId',

(-)a/src/lte/bindings/modulegen__gcc_LP64.py (-4 lines)

Lines 7066-7075 def register_Ns3TraceFadingLossModel_methods(root_module, cls):	Link Here

7066

    cls.add_constructor([param('ns3::TraceFadingLossModel const &', 'arg0')])

7066

    cls.add_constructor([param('ns3::TraceFadingLossModel const &', 'arg0')])

7067

    ## trace-fading-loss-model.h (module 'lte'): ns3::TraceFadingLossModel::TraceFadingLossModel() [constructor]

7067

    ## trace-fading-loss-model.h (module 'lte'): ns3::TraceFadingLossModel::TraceFadingLossModel() [constructor]

7068

    cls.add_constructor([])

7068

    cls.add_constructor([])

7069

    ## trace-fading-loss-model.h (module 'lte'): void ns3::TraceFadingLossModel::CreateFadingChannelRealization(ns3::Ptr<const ns3::MobilityModel> enbMobility, ns3::Ptr<const ns3::MobilityModel> ueMobility) [member function]

7070

    cls.add_method('CreateFadingChannelRealization',

7071

                   'void',

7072

                   [param('ns3::Ptr< ns3::MobilityModel const >', 'enbMobility'), param('ns3::Ptr< ns3::MobilityModel const >', 'ueMobility')])

7073

    ## trace-fading-loss-model.h (module 'lte'): static ns3::TypeId ns3::TraceFadingLossModel::GetTypeId() [member function]

7069

    ## trace-fading-loss-model.h (module 'lte'): static ns3::TypeId ns3::TraceFadingLossModel::GetTypeId() [member function]

7074

    cls.add_method('GetTypeId',

7070

    cls.add_method('GetTypeId',

7075

                   'ns3::TypeId',

7071

                   'ns3::TypeId',

(-)a/src/lte/model/lte-spectrum-value-helper.cc (-2 / +1 lines)

Lines 231-237 operator << (std::ostream& os, const std::vector<int>& v)	Link Here

231

Ptr<SpectrumValue>

231

Ptr<SpectrumValue>

232

LteSpectrumValueHelper::CreateTxPowerSpectralDensity (uint16_t earfcn, uint8_t txBandwidthConfiguration, double powerTx, std::vector <int> activeRbs)

232

LteSpectrumValueHelper::CreateTxPowerSpectralDensity (uint16_t earfcn, uint8_t txBandwidthConfiguration, double powerTx, std::vector <int> activeRbs)

233

234

  NS_LOG_FUNCTION (earfcn << (uint16_t) txBandwidthConfiguration << powerTx << activeRbs);

234

  NS_LOG_FUNCTION (earfcn << (uint16_t) txBandwidthConfiguration << powerTx << &activeRbs);

235

236

  Ptr<SpectrumModel> model = GetSpectrumModel (earfcn, txBandwidthConfiguration);

236

  Ptr<SpectrumModel> model = GetSpectrumModel (earfcn, txBandwidthConfiguration);

237

  Ptr<SpectrumValue> txPsd = Create <SpectrumValue> (model);

237

  Ptr<SpectrumValue> txPsd = Create <SpectrumValue> (model);

238

Return to bug 1470