Attachment #1138 for bug #1156

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

(-)a/src/internet/helper/internet-stack-helper.cc (+6 lines)

Lines 492-497	Link Here

492

      result = ipv4L3Protocol->TraceConnectWithoutContext ("Rx", MakeCallback (&Ipv4L3ProtocolRxTxSink));

492

      result = ipv4L3Protocol->TraceConnectWithoutContext ("Rx", MakeCallback (&Ipv4L3ProtocolRxTxSink));

493

      NS_ASSERT_MSG (result == true, "InternetStackHelper::EnablePcapIpv4Internal():  "

493

      NS_ASSERT_MSG (result == true, "InternetStackHelper::EnablePcapIpv4Internal():  "

494

                     "Unable to connect ipv4L3Protocol \"Rx\"");

494

                     "Unable to connect ipv4L3Protocol \"Rx\"");

495

      // cast result to void, to suppress ‘result’ set but not used compiler-warning

496

      // for optimized builds

497

      (void) result;

495

498

496

499

497

  g_interfaceFileMapIpv4[std::make_pair (ipv4, interface)] = file;

500

  g_interfaceFileMapIpv4[std::make_pair (ipv4, interface)] = file;

Lines 584-589	Link Here

584

      result = ipv6L3Protocol->TraceConnectWithoutContext ("Rx", MakeCallback (&Ipv6L3ProtocolRxTxSink));

587

      result = ipv6L3Protocol->TraceConnectWithoutContext ("Rx", MakeCallback (&Ipv6L3ProtocolRxTxSink));

585

      NS_ASSERT_MSG (result == true, "InternetStackHelper::EnablePcapIpv6Internal():  "

588

      NS_ASSERT_MSG (result == true, "InternetStackHelper::EnablePcapIpv6Internal():  "

586

                     "Unable to connect ipv6L3Protocol \"Rx\"");

589

                     "Unable to connect ipv6L3Protocol \"Rx\"");

590

      // cast found to void, to suppress ‘result’ set but not used compiler-warning

591

      // for optimized builds

592

      (void) result;

587

593

588

594

589

  g_interfaceFileMapIpv6[std::make_pair (ipv6, interface)] = file;

595

  g_interfaceFileMapIpv6[std::make_pair (ipv6, interface)] = file;

(-)a/src/internet/model/global-router-interface.cc (-1 lines)

Lines 1043-1049	Link Here

1043

      NS_LOG_WARN ("Warning, interface has multiple IP addresses; using only the primary one");

1043

      NS_LOG_WARN ("Warning, interface has multiple IP addresses; using only the primary one");

1044

1045

  Ipv4Address addrLocal = ipv4Local->GetAddress (interfaceLocal, 0).GetLocal ();

1045

  Ipv4Address addrLocal = ipv4Local->GetAddress (interfaceLocal, 0).GetLocal ();

1046

  Ipv4Mask maskLocal = ipv4Local->GetAddress (interfaceLocal, 0).GetMask ();

1047

  NS_LOG_LOGIC ("Working with local address " << addrLocal);

1046

  NS_LOG_LOGIC ("Working with local address " << addrLocal);

1048

  uint16_t metricLocal = ipv4Local->GetMetric (interfaceLocal);

1047

  uint16_t metricLocal = ipv4Local->GetMetric (interfaceLocal);

1049

1048

(-)a/src/internet/model/tcp-socket-base.cc (+3 lines)

Lines 416-421	Link Here

416

      bool found;

416

      bool found;

417

      found = packet->PeekPacketTag (tag);

417

      found = packet->PeekPacketTag (tag);

418

      NS_ASSERT (found);

418

      NS_ASSERT (found);

419

      // cast found to void, to suppress ‘found’ set but not used compiler-warning

420

      // for optimized builds

421

      (void) found;

419

      fromAddress = tag.GetAddress ();

422

      fromAddress = tag.GetAddress ();

420

423

421

  return packet;

424

  return packet;

(-)a/src/internet/model/udp-socket-impl.cc (+3 lines)

Lines 547-552	Link Here

547

      bool found;

547

      bool found;

548

      found = packet->PeekPacketTag (tag);

548

      found = packet->PeekPacketTag (tag);

549

      NS_ASSERT (found);

549

      NS_ASSERT (found);

550

      // cast found to void, to suppress ‘found’ set but not used compiler-warning

551

      // for optimized builds

552

      (void) found;

550

      fromAddress = tag.GetAddress ();

553

      fromAddress = tag.GetAddress ();

551

554

552

  return packet;

555

  return packet;




      candidate.Push (v);
    }

  uint32_t lastDistance = 0;

  for (int i = 0; i < 100; ++i)
    {
      SPFVertex *v = candidate.Pop ();
      lastDistance = v->GetDistanceFromRoot ();
      delete v;
      v = 0;
    }

(-)a/src/internet/test/ipv4-raw-test.cc (+6 lines)

Lines 112-117	Link Here

112

  NS_ASSERT (m_receivedPacket->GetSize () == 2);

112

  NS_ASSERT (m_receivedPacket->GetSize () == 2);

113

  m_receivedPacket = socket->Recv (std::numeric_limits<uint32_t>::max(), 0);

113

  m_receivedPacket = socket->Recv (std::numeric_limits<uint32_t>::max(), 0);

114

  NS_ASSERT (availableData == m_receivedPacket->GetSize ());

114

  NS_ASSERT (availableData == m_receivedPacket->GetSize ());

115

  // cast availableData to void, to suppress 'availableData' set

116

  // but not used compiler warnings with optimized builds

117

  (void) availableData;

115

118

116

119

117

void Ipv4RawSocketImplTest::ReceivePkt2 (Ptr<Socket> socket)

120

void Ipv4RawSocketImplTest::ReceivePkt2 (Ptr<Socket> socket)

Lines 122-127	Link Here

122

  NS_ASSERT (m_receivedPacket2->GetSize () == 2);

125

  NS_ASSERT (m_receivedPacket2->GetSize () == 2);

123

  m_receivedPacket2 = socket->Recv (std::numeric_limits<uint32_t>::max(), 0);

126

  m_receivedPacket2 = socket->Recv (std::numeric_limits<uint32_t>::max(), 0);

124

  NS_ASSERT (availableData == m_receivedPacket2->GetSize ());

127

  NS_ASSERT (availableData == m_receivedPacket2->GetSize ());

128

  // cast availableData to void, to suppress 'availableData' set

129

  // but not used compiler warnings with optimized builds

130

   (void) availableData;

125

131

126

132

127

void

133

void

(-)a/src/internet/test/udp-test.cc (+9 lines)

Lines 94-99	Link Here

  availableData = socket->GetRxAvailable ();

  availableData = socket->GetRxAvailable ();

  m_receivedPacket = socket->Recv (std::numeric_limits<uint32_t>::max(), 0);

  m_receivedPacket = socket->Recv (std::numeric_limits<uint32_t>::max(), 0);

  NS_ASSERT (availableData == m_receivedPacket->GetSize ());

  NS_ASSERT (availableData == m_receivedPacket->GetSize ());

  // cast availableData to void, to suppress 'availableData' set

  // but not used compiler warnings with optimized builds

  (void) availableData;

100

101

void

102

void

Lines 152-157	Link Here

152

  availableData = socket->GetRxAvailable ();

155

  availableData = socket->GetRxAvailable ();

153

  m_receivedPacket = socket->Recv (std::numeric_limits<uint32_t>::max(), 0);

156

  m_receivedPacket = socket->Recv (std::numeric_limits<uint32_t>::max(), 0);

154

  NS_ASSERT (availableData == m_receivedPacket->GetSize ());

157

  NS_ASSERT (availableData == m_receivedPacket->GetSize ());

158

  // cast availableData to void, to suppress 'availableData' set

159

  // but not used compiler warnings with optimized builds

160

  (void) availableData;

155

161

156

162

157

void UdpSocketImplTest::ReceivePkt2 (Ptr<Socket> socket)

163

void UdpSocketImplTest::ReceivePkt2 (Ptr<Socket> socket)

Lines 160-165	Link Here

160

  availableData = socket->GetRxAvailable ();

166

  availableData = socket->GetRxAvailable ();

161

  m_receivedPacket2 = socket->Recv (std::numeric_limits<uint32_t>::max(), 0);

167

  m_receivedPacket2 = socket->Recv (std::numeric_limits<uint32_t>::max(), 0);

162

  NS_ASSERT (availableData == m_receivedPacket2->GetSize ());

168

  NS_ASSERT (availableData == m_receivedPacket2->GetSize ());

169

  // cast availableData to void, to suppress 'availableData' set

170

  // but not used compiler warnings with optimized builds

171

  (void) availableData;

163

172

164

173

165

void

174

void

Return to bug 1156