Attachment #1329 for bug #1170

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

(-)a/examples/energy/energy-model-example.cc (-3 / +4 lines)

Lines 43-48	Link Here

void

void

ReceivePacket (Ptr<Socket> socket)

ReceivePacket (Ptr<Socket> socket)

#ifdef NS3_LOG_ENABLE

  Ptr<Packet> packet;

  Ptr<Packet> packet;

  Address from;

  Address from;

  while (packet = socket->RecvFrom (from))

  while (packet = socket->RecvFrom (from))

Lines 53-63	Link Here

          NS_LOG_UNCOND ("--\nReceived one packet! Socket: "<< iaddr.GetIpv4 ()

          NS_LOG_UNCOND ("--\nReceived one packet! Socket: "<< iaddr.GetIpv4 ()

                                                            << " port: " << iaddr.GetPort () << " at time = " <<

                                                            << " port: " << iaddr.GetPort () << " at time = " <<

                         Simulator::Now ().GetSeconds () << "\n--");

                         Simulator::Now ().GetSeconds () << "\n--");

          //cast iaddr to void, to suppress 'iaddr' set but not used compiler warning

          //in optimized builds

          (void) iaddr;

#else

  while (socket->Recv ());

#endif

/**

/**




}

void
PrintReceivedPacket (Ptr<Socket> socket, Ptr<Packet> packet)
{
#ifdef NS3_LOG_ENABLE
  SocketAddressTag tag;
  bool found;
  found = packet->PeekPacketTag (tag);
  if (found)
    {
      InetSocketAddress addr = InetSocketAddress::ConvertFrom (tag.GetAddress ());
      NS_LOG_UNCOND (Simulator::Now ().GetSeconds () <<  " " << socket->GetNode ()->GetId ()
                                                     << " received one packet from " << addr.GetIpv4 ());
    }
  else
    {
      NS_LOG_UNCOND (Simulator::Now ().GetSeconds () << " " << socket->GetNode ()->GetId ()
                                                     << " received one packet!");
    }
#endif
}

void
RoutingExperiment::ReceivePacket (Ptr<Socket> socket)
{
  Ptr<Packet> packet;

    {
      bytesTotal += packet->GetSize ();
      packetsReceived += 1;
      PrintReceivedPacket (socket, packet);
      bool found;
      found = packet->PeekPacketTag (tag);
      if (found)
        {
          InetSocketAddress addr = InetSocketAddress::ConvertFrom (tag.GetAddress ());
          NS_LOG_UNCOND (Simulator::Now ().GetSeconds () <<  " " << socket->GetNode ()->GetId ()
                                                         << " received one packet from " << addr.GetIpv4 ());
          //cast addr to void, to suppress 'addr' set but not used
          //compiler warning in optimized builds
          (void) addr;
        }
      else
        {
          NS_LOG_UNCOND (Simulator::Now ().GetSeconds () << " " << socket->GetNode ()->GetId ()
                                                         << " received one packet!");
        }
    }
}


(-)a/examples/stats/wifi-example-apps.h (-2 lines)

Lines 25-32	Link Here

*/

*/

// #define NS3_LOG_ENABLE // Now defined by Makefile

#include "ns3/core-module.h"

#include "ns3/core-module.h"

#include "ns3/network-module.h"

#include "ns3/network-module.h"

#include "ns3/application.h"

#include "ns3/application.h"

(-)a/examples/stats/wifi-example-sim.cc (-2 lines)

Lines 30-37	Link Here

*/

*/

// #define NS3_LOG_ENABLE // Now defined by Makefile

#include <ctime>

#include <ctime>

#include <sstream>

#include <sstream>





private:

  Vector GetPosition (Ptr<Node> node);
  Ptr<Socket> SetupPacketReceive (Ptr<Node> node);
  NodeContainer GenerateNeighbors (NodeContainer c, uint32_t senderId);


  Simulator::Schedule (Seconds (0.1), &Experiment::CheckThroughput, this);
}

Vector
Experiment::GetPosition (Ptr<Node> node)
{
  Ptr<MobilityModel> mobility = node->GetObject<MobilityModel> ();
  return mobility->GetPosition ();
}

/**
 *
 * Take the grid map, divide it into 4 quadrants

    }
}

Vector
GetPosition (Ptr<Node> node)
{
  Ptr<MobilityModel> mobility = node->GetObject<MobilityModel> ();
  return mobility->GetPosition ();
}

void
PrintPosition (Ptr<Node> client, Ptr<Node> server)
{
#ifdef NS3_LOG_ENABLE
  Vector serverPos = GetPosition (server);
  Vector clientPos = GetPosition (client);


                                        << " with ip " << ipv4AddrClient
                                        << " position (" << clientPos.x << "," << clientPos.y << "," << clientPos.z << ")"
                                        << "\n");
#endif
}

void
Experiment::ApplicationSetup (Ptr<Node> client, Ptr<Node> server, double start, double stop)
{
  Ptr<Ipv4> ipv4Server = server->GetObject<Ipv4>();

  Ipv4InterfaceAddress iaddrServer = ipv4Server->GetAddress (1,0);
  Ipv4Address ipv4AddrServer = iaddrServer.GetLocal ();

  PrintPosition (client, server);

  // Equipping the source  node with OnOff Application used for sending 
  OnOffHelper onoff ("ns3::UdpSocketFactory", Address (InetSocketAddress (Ipv4Address ("10.0.0.1"), port)));





void ReceivePacket (Ptr<Socket> socket)
{
#ifdef NS3_LOG_ENABLE
  Address addr;
  socket->GetSockName (addr);
  InetSocketAddress iaddr = InetSocketAddress::ConvertFrom (addr);
  NS_LOG_UNCOND ("Received one packet!  Socket: " << iaddr.GetIpv4 () << " port: " << iaddr.GetPort ());
#endif
  //in optimized builds
  (void) iaddr;
}

static void GenerateTraffic (Ptr<Socket> socket, uint32_t pktSize, 




    }
}

void PrintStats (Address& from, uint32_t packetSize, uint32_t totalRxSize)
{
#ifdef NS3_LOG_ENABLE
  InetSocketAddress address = InetSocketAddress::ConvertFrom (from);
  NS_LOG_INFO ("Received " <<  packetSize << " bytes from " <<
               address.GetIpv4 () << " [" << address << "]"
               << " total Rx " << totalRxSize);
#endif
}

void PacketSink::HandleRead (Ptr<Socket> socket)
{
  NS_LOG_FUNCTION (this << socket);

      if (InetSocketAddress::IsMatchingType (from))
        {
          m_totalRx += packet->GetSize ();
          PrintStats(from, packet->GetSize (), m_totalRx);
          NS_LOG_INFO ("Received " << packet->GetSize () << " bytes from " <<
                       address.GetIpv4 () << " [" << address << "]"
                                   << " total Rx " << m_totalRx);
          //cast address to void , to suppress 'address' set but not used 
          //compiler warning in optimized builds
          (void) address;
        }
      m_rxTrace (packet, from);
    }

(-)a/src/applications/model/v4ping.cc (-3 lines)

Lines 243-251	Link Here

243

  InetSocketAddress dst = InetSocketAddress (m_remote, 0);

243

  InetSocketAddress dst = InetSocketAddress (m_remote, 0);

244

  status = m_socket->Connect (dst);

244

  status = m_socket->Connect (dst);

245

  NS_ASSERT (status != -1);

245

  NS_ASSERT (status != -1);

246

  //cast status to void, to suppress 'status' set but not used compiler warning

247

  //in optimized builds

248

  (void) status;

249

246

250

  Send ();

247

  Send ();

251

248




      result = ipv4L3Protocol->TraceConnectWithoutContext ("Rx", MakeCallback (&Ipv4L3ProtocolRxTxSink));
      NS_ASSERT_MSG (result == true, "ClickInternetStackHelper::EnablePcapIpv4Internal():  "
                     "Unable to connect ipv4L3Protocol \"Rx\"");
      (void) result; //cast to void to suppress variable set but not used compiler warning in optimized builds
    }

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

          // be aggregated to the same node.
          //
          Ptr<Ipv4L3Protocol> ipv4L3Protocol = ipv4->GetObject<Ipv4L3Protocol> ();
          bool result = ipv4L3Protocol->TraceConnectWithoutContext ("Drop",
                                                                    MakeBoundCallback (&Ipv4L3ProtocolDropSinkWithoutContext,
                                                                                       theStream));
          NS_ASSERT_MSG (result == true, "ClickInternetStackHelper::EanableAsciiIpv4Internal():  "
                         "Unable to connect ipv4L3Protocol \"Drop\"");
        }





  ret = simclick_sim_command (click->m_simNode, SIMCLICK_IFID_FROM_NAME, "eth1");
  NS_TEST_EXPECT_MSG_EQ (ret, -1, "No eth1 on node");

  // Cast ret to void to work around set-but-unused warnings from compilers
  (void) ret;
}

class ClickIpMacAddressFromNameTest : public TestCase

  NS_TEST_EXPECT_MSG_EQ (strcmp (buf, "00:00:00:00:00:00"), 0, "tun0 has IP 127.0.0.1");

  delete [] buf;

  // Cast ret to void to work around set-but-unused warnings from compilers
  (void) ret;
}

class ClickTrivialTest : public TestCase

  NS_TEST_EXPECT_MSG_EQ (ret, 0, "eth1 does not exist, so return 0");

  delete [] buf;

  // Cast ret to void to work around set-but-unused warnings from compilers
  (void) ret;
}

class ClickIfidFromNameTestSuite : public TestSuite




  // invoke cbOne function through callback instance
  double retOne;
  retOne = one (10.0, 20.0);
  // callback returned expected value
  NS_ASSERT (retOne == 10.0);
  (void) retOne; 

  // return type: int
  // first arg type: double

  // invoke MyCb::cbTwo through callback instance
  int retTwo;
  retTwo = two (10.0);
  // callback returned expected value
  NS_ASSERT (retTwo == -5);

  two = MakeNullCallback<int, double> ();
  // invoking a null callback is just like
  // invoking a null function pointer:





#else /* NS3_ASSERT_ENABLE */

#define NS_ASSERT(condition)                          \
  do                                                  \
    {                                                 \
      (void)sizeof (condition);                       \
    }                                                 \
  while (false)

#define NS_ASSERT_MSG(condition, message)             \
  do                                                  \
    {                                                 \
      (void)sizeof (condition);                       \
    }                                                 \
  while (false)

#endif /* NS3_ASSERT_ENABLE */


(-)a/src/core/model/unused.h (+8 lines)

Line 0	Link Here

#ifndef UNUSED_H

#define UNUSED_H

#ifndef NS_UNUSED

# define NS_UNUSED(x) ((void)(x))

#endif

#endif /* UNUSED_H */

(-)a/src/core/wscript (-1 / +2 lines)

Lines 240-246	Link Here

240

        'model/vector.h',

240

        'model/vector.h',

241

        'model/default-deleter.h',

241

        'model/default-deleter.h',

242

        'model/fatal-impl.h',

242

        'model/fatal-impl.h',

243

        'model/system-path.h'

243

        'model/system-path.h',

244

        'model/unused.h',

244

245

246

    if sys.platform == 'win32':

247

    if sys.platform == 'win32':

(-)a/src/flow-monitor/model/ipv4-flow-probe.cc (-3 / +1 lines)

Lines 331-339	Link Here

331

  bool tagFound;

331

  bool tagFound;

332

  tagFound = ConstCast<Packet> (ipPayload)->RemovePacketTag (fTag);

332

  tagFound = ConstCast<Packet> (ipPayload)->RemovePacketTag (fTag);

333

  NS_ASSERT_MSG (tagFound, "FlowProbeTag is missing");

333

  NS_ASSERT_MSG (tagFound, "FlowProbeTag is missing");

334

  // cast tagFound to void, to suppress 'tagFound' set but not used compiler

334

335

  // warning in optimized builds

336

  (void) tagFound;

337

  FlowId flowId = fTag.GetFlowId ();

335

  FlowId flowId = fTag.GetFlowId ();

338

  FlowPacketId packetId = fTag.GetPacketId ();

336

  FlowPacketId packetId = fTag.GetPacketId ();

339

  uint32_t size = fTag.GetPacketSize ();

337

  uint32_t size = fTag.GetPacketSize ();




      result = ipv4L3Protocol->TraceConnectWithoutContext ("Rx", MakeCallback (&Ipv4L3ProtocolRxTxSink));
      NS_ASSERT_MSG (result == true, "InternetStackHelper::EnablePcapIpv4Internal():  "
                     "Unable to connect ipv4L3Protocol \"Rx\"");
      // cast result to void, to suppress ‘result’ set but not used compiler-warning
      // for optimized builds
      (void) result;
    }

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

      result = ipv6L3Protocol->TraceConnectWithoutContext ("Rx", MakeCallback (&Ipv6L3ProtocolRxTxSink));
      NS_ASSERT_MSG (result == true, "InternetStackHelper::EnablePcapIpv6Internal():  "
                     "Unable to connect ipv6L3Protocol \"Rx\"");
      // cast found to void, to suppress ‘result’ set but not used compiler-warning
      // for optimized builds
      (void) result;
    }

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

          // be aggregated to the same node.
          //
          Ptr<Ipv4L3Protocol> ipv4L3Protocol = ipv4->GetObject<Ipv4L3Protocol> ();
          bool result = ipv4L3Protocol->TraceConnectWithoutContext ("Drop",
                                                                    MakeBoundCallback (&Ipv4L3ProtocolDropSinkWithoutContext, theStream));
          NS_ASSERT_MSG (result == true, "InternetStackHelper::EnableAsciiIpv4Internal():  "
                         "Unable to connect ipv4L3Protocol \"Drop\"");
          result = ipv4L3Protocol->TraceConnectWithoutContext ("Tx", 

          // be aggregated to the same node.
          //
          Ptr<Ipv6L3Protocol> ipv6L3Protocol = ipv6->GetObject<Ipv6L3Protocol> ();
          bool result = ipv6L3Protocol->TraceConnectWithoutContext ("Drop",
                                                                    MakeBoundCallback (&Ipv6L3ProtocolDropSinkWithoutContext, theStream));
          NS_ASSERT_MSG (result == true, "InternetStackHelper::EnableAsciiIpv6Internal():  "
                         "Unable to connect ipv6L3Protocol \"Drop\"");
          result = ipv6L3Protocol->TraceConnectWithoutContext ("Tx", 

(-)a/src/internet/model/ipv6-l3-protocol.cc (-2 lines)

Lines 969-977	Link Here

969

      if (ipv6Extension)

969

      if (ipv6Extension)

970

971

          uint8_t nextHeaderStep = 0;

971

          uint8_t nextHeaderStep = 0;

972

#ifdef NS3_ASSERT_ENABLE

973

          uint8_t curHeader = nextHeader;

972

          uint8_t curHeader = nextHeader;

974

#endif

975

          nextHeaderStep = ipv6Extension->Process (p, nextHeaderPosition, ip, dst, &nextHeader, isDropped);

973

          nextHeaderStep = ipv6Extension->Process (p, nextHeaderPosition, ip, dst, &nextHeader, isDropped);

976

          nextHeaderPosition += nextHeaderStep;

974

          nextHeaderPosition += nextHeaderStep;

977

975

(-)a/src/internet/model/nsc-tcp-socket-impl.cc (-3 lines)

Lines 449-457	Link Here

449

      bool found;

449

      bool found;

450

      found = packet->PeekPacketTag (tag);

450

      found = packet->PeekPacketTag (tag);

451

      NS_ASSERT (found);

451

      NS_ASSERT (found);

452

      // cast found to void, to suppress 'found' set but not used

453

      // compiler warning in optimized builds

454

      (void) found;

455

      fromAddress = tag.GetAddress ();

452

      fromAddress = tag.GetAddress ();

456

453

457

  return packet;

454

  return packet;

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

Lines 547-555	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

      //in optimized builds

552

      (void) found;

553

      fromAddress = tag.GetAddress ();

550

      fromAddress = tag.GetAddress ();

554

551

555

  return packet;

552

  return packet;

(-)a/src/internet/test/ipv4-fragmentation-test.cc (-1 lines)

Lines 20-26	Link Here

/**

/**

 * This is the test code for ipv4-l3protocol.cc (only the fragmentation and reassembly part).

 * This is the test code for ipv4-l3protocol.cc (only the fragmentation and reassembly part).

*/

*/

#define NS3_LOG_ENABLE 1

#include "ns3/test.h"

#include "ns3/test.h"

#include "ns3/config.h"

#include "ns3/config.h"





void Ipv4HeaderTest::ReceivePkt (Ptr<Socket> socket)
{
#ifdef NS3_ASSERT_ENABLE
  uint32_t availableData;
  availableData = socket->GetRxAvailable ();
  m_receivedPacket = socket->Recv (2, MSG_PEEK);
  NS_ASSERT (m_receivedPacket->GetSize () == 2);
#endif
  m_receivedPacket = socket->Recv (std::numeric_limits<uint32_t>::max (), 0);
#ifdef NS3_ASSERT_ENABLE
  NS_ASSERT (availableData == m_receivedPacket->GetSize ());
#endif
  //compiler warning
  (void) availableData;
  m_receivedPacket->PeekHeader (m_receivedHeader);
}






void Ipv4RawSocketImplTest::ReceivePkt (Ptr<Socket> socket)
{
#ifdef NS3_ASSERT_ENABLE
  uint32_t availableData;
  availableData = socket->GetRxAvailable ();
  m_receivedPacket = socket->Recv (2, MSG_PEEK);
  NS_ASSERT (m_receivedPacket->GetSize () == 2);
#endif
  m_receivedPacket = socket->Recv (std::numeric_limits<uint32_t>::max (), 0);
#ifdef NS3_ASSERT_ENABLE
  NS_ASSERT (availableData == m_receivedPacket->GetSize ());
#endif
  //compiler warning
  (void) availableData;
}

void Ipv4RawSocketImplTest::ReceivePkt2 (Ptr<Socket> socket)
{
#ifdef NS3_ASSERT_ENABLE
  uint32_t availableData;
  availableData = socket->GetRxAvailable ();
  m_receivedPacket2 = socket->Recv (2, MSG_PEEK);
  NS_ASSERT (m_receivedPacket2->GetSize () == 2);
#endif
  m_receivedPacket2 = socket->Recv (std::numeric_limits<uint32_t>::max (), 0);
#ifdef NS3_ASSERT_ENABLE
  NS_ASSERT (availableData == m_receivedPacket2->GetSize ());
#endif
  //compiler warning
  (void) availableData;
}

void





void UdpSocketLoopbackTest::ReceivePkt (Ptr<Socket> socket)
{
#ifdef NS3_ASSERT_ENABLE
  uint32_t availableData;
  availableData = socket->GetRxAvailable ();
#endif
  m_receivedPacket = socket->Recv (std::numeric_limits<uint32_t>::max (), 0);
#ifdef NS3_ASSERT_ENABLE
  NS_ASSERT (availableData == m_receivedPacket->GetSize ());
#endif
  //compiler warning
  (void) availableData;
}

void


void UdpSocketImplTest::ReceivePkt (Ptr<Socket> socket)
{
#ifdef NS3_ASSERT_ENABLE
  uint32_t availableData;
  availableData = socket->GetRxAvailable ();
#endif
  m_receivedPacket = socket->Recv (std::numeric_limits<uint32_t>::max (), 0);
#ifdef NS3_ASSERT_ENABLE
  NS_ASSERT (availableData == m_receivedPacket->GetSize ());
#endif
  //compiler warning
  (void) availableData;
}

void UdpSocketImplTest::ReceivePkt2 (Ptr<Socket> socket)
{
#ifdef NS3_ASSERT_ENABLE
  uint32_t availableData;
  availableData = socket->GetRxAvailable ();
#endif
  m_receivedPacket2 = socket->Recv (std::numeric_limits<uint32_t>::max (), 0);
#ifdef NS3_ASSERT_ENABLE
  NS_ASSERT (availableData == m_receivedPacket2->GetSize ());
#endif
  //compiler warning
  (void) availableData;
}

void

(-)a/src/mobility/helper/ns2-mobility-helper.cc (-2 / +2 lines)

Lines 42-47	Link Here

#include <sstream>

#include <sstream>

#include <map>

#include <map>

#include "ns3/log.h"

#include "ns3/log.h"

#include "ns3/unused.h"

#include "ns3/simulator.h"

#include "ns3/simulator.h"

#include "ns3/node-list.h"

#include "ns3/node-list.h"

#include "ns3/node.h"

#include "ns3/node.h"

Lines 446-453	Link Here

446

447

  char *endp;

448

  char *endp;

448

  double v = strtod (s.c_str (), &endp); // declared with warn_unused_result

449

  double v = strtod (s.c_str (), &endp); // declared with warn_unused_result

449

  //cast v to void, to suppress v set but not used compiler warning

450

  NS_UNUSED (v); // suppress "set but not used" compiler warning

450

  (void) v;

451

  return endp == s.c_str () + s.size ();

451

  return endp == s.c_str () + s.size ();

452

453




template <typename T> void
PcapHelper::HookDefaultSink (Ptr<T> object, std::string tracename, Ptr<PcapFileWrapper> file)
{
  bool result =
    object->TraceConnectWithoutContext (tracename.c_str (), MakeBoundCallback (&DefaultSink, file));
  NS_ASSERT_MSG (result == true, "PcapHelper::HookDefaultSink():  Unable to hook \"" << tracename << "\"");
}

template <typename T> void
AsciiTraceHelper::HookDefaultEnqueueSinkWithoutContext (Ptr<T> object, std::string tracename, Ptr<OutputStreamWrapper> file)
{
  bool result =
    object->TraceConnectWithoutContext (tracename, MakeBoundCallback (&DefaultEnqueueSinkWithoutContext, file));
  NS_ASSERT_MSG (result == true, "AsciiTraceHelper::HookDefaultEnqueueSinkWithoutContext():  Unable to hook \"" 
                 << tracename << "\"");

  std::string tracename, 
  Ptr<OutputStreamWrapper> stream)
{
  bool result =
    object->TraceConnect (tracename, context, MakeBoundCallback (&DefaultEnqueueSinkWithContext, stream));
  NS_ASSERT_MSG (result == true, "AsciiTraceHelper::HookDefaultEnqueueSinkWithContext():  Unable to hook \"" 
                 << tracename << "\"");

template <typename T> void
AsciiTraceHelper::HookDefaultDropSinkWithoutContext (Ptr<T> object, std::string tracename, Ptr<OutputStreamWrapper> file)
{
  bool result =
    object->TraceConnectWithoutContext (tracename, MakeBoundCallback (&DefaultDropSinkWithoutContext, file));
  NS_ASSERT_MSG (result == true, "AsciiTraceHelper::HookDefaultDropSinkWithoutContext():  Unable to hook \"" 
                 << tracename << "\"");

  std::string tracename, 
  Ptr<OutputStreamWrapper> stream)
{
  bool result =
    object->TraceConnect (tracename, context, MakeBoundCallback (&DefaultDropSinkWithContext, stream));
  NS_ASSERT_MSG (result == true, "AsciiTraceHelper::HookDefaultDropSinkWithContext():  Unable to hook \"" 
                 << tracename << "\"");

template <typename T> void
AsciiTraceHelper::HookDefaultDequeueSinkWithoutContext (Ptr<T> object, std::string tracename, Ptr<OutputStreamWrapper> file)
{
  bool result =
    object->TraceConnectWithoutContext (tracename, MakeBoundCallback (&DefaultDequeueSinkWithoutContext, file));
  NS_ASSERT_MSG (result == true, "AsciiTraceHelper::HookDefaultDequeueSinkWithoutContext():  Unable to hook \"" 
                 << tracename << "\"");

  std::string tracename, 
  Ptr<OutputStreamWrapper> stream)
{
  bool result =
    object->TraceConnect (tracename, context, MakeBoundCallback (&DefaultDequeueSinkWithContext, stream));
  NS_ASSERT_MSG (result == true, "AsciiTraceHelper::HookDefaultDequeueSinkWithContext():  Unable to hook \"" 
                 << tracename << "\"");

template <typename T> void
AsciiTraceHelper::HookDefaultReceiveSinkWithoutContext (Ptr<T> object, std::string tracename, Ptr<OutputStreamWrapper> file)
{
  bool result =
    object->TraceConnectWithoutContext (tracename, MakeBoundCallback (&DefaultReceiveSinkWithoutContext, file));
  NS_ASSERT_MSG (result == true, "AsciiTraceHelper::HookDefaultReceiveSinkWithoutContext():  Unable to hook \"" 
                 << tracename << "\"");

  std::string tracename, 
  Ptr<OutputStreamWrapper> stream)
{
  bool result =
    object->TraceConnect (tracename, context, MakeBoundCallback (&DefaultReceiveSinkWithContext, stream));
  NS_ASSERT_MSG (result == true, "AsciiTraceHelper::HookDefaultReceiveSinkWithContext():  Unable to hook \"" 
                 << tracename << "\"");

(-)a/src/network/model/socket.cc (-3 lines)

Lines 314-322	Link Here

314

315

316

      NS_ASSERT_MSG (found, "Socket cannot be bound to a NetDevice not existing on the Node");

316

      NS_ASSERT_MSG (found, "Socket cannot be bound to a NetDevice not existing on the Node");

317

      //cast found to void, to suppress 'found' set but not used compiler warning

318

      //in optimized builds

319

      (void) found;

320

317

321

  m_boundnetdevice = netdevice;

318

  m_boundnetdevice = netdevice;

322

  return;

319

  return;

(-)a/src/network/utils/packet-socket.cc (-3 lines)

Lines 441-449	Link Here

441

      bool found;

441

      bool found;

442

      found = packet->PeekPacketTag (tag);

442

      found = packet->PeekPacketTag (tag);

443

      NS_ASSERT (found);

443

      NS_ASSERT (found);

444

      //cast found to void, to suppress 'found' set but not used compiler warning

445

      //in optimized builds

446

      (void) found;

447

      fromAddress = tag.GetAddress ();

444

      fromAddress = tag.GetAddress ();

448

445

449

  return packet;

446

  return packet;

(-)a/src/network/utils/radiotap-header.cc (-2 / +5 lines)

Lines 134-141	Link Here

134

135

  NS_LOG_FUNCTION (this);

135

  NS_LOG_FUNCTION (this);

136

137

  uint8_t __attribute__ ((unused)) tmp = start.ReadU8 (); // major version of radiotap header

137

#ifdef NS3_ASSERT_ENABLE

138

  NS_ASSERT_MSG (tmp == 0x00, "RadiotapHeader::Deserialize(): Unexpected major version");

138

  NS_ASSERT_MSG (start.ReadU8 () == 0x00, "RadiotapHeader::Deserialize(): Unexpected major version"); // major version of radiotap header

139

#else

140

  start.Next (); // major version of radiotap header

141

#endif

139

  start.ReadU8 (); // pad field

142

  start.ReadU8 (); // pad field

140

143

141

  m_length = start.ReadU16 (); // entire length of radiotap data + header

144

  m_length = start.ReadU16 (); // entire length of radiotap data + header




void 
WifiInterferenceTestCase::ReceivePacket (Ptr<Socket> socket)
{
#ifdef NS3_LOG_ENABLE
  Address addr;
  socket->GetSockName (addr);
  InetSocketAddress iaddr = InetSocketAddress::ConvertFrom (addr);
  NS_LOG_UNCOND ("Received one packet!  Socket: " << iaddr.GetIpv4 () << " port: " << iaddr.GetPort ());
#endif
  //in optimized builds
  (void) iaddr;
}

void 




#include <regex.h>

#include "ns3/log.h"
#include "ns3/unused.h"
#include "rocketfuel-topology-reader.h"

namespace ns3 {

int nodesNumber = 0;
std::map<std::string, Ptr<Node> > nodeMap;

void
PrintNodeInfo (std::string & uid, std::string & loc, bool dns, bool bb,
               std::vector <std::string>::size_type neighListSize,
               std::string & name, int radius)
{
  /* uid @loc [+] [bb] (num_neigh) [&ext] -> <nuid-1> <nuid-2> ... {-euid} ... =name[!] rn */
  NS_LOG_INFO ("Load Node[" << uid << "]: location: " << loc << " dns: " << dns
                            << " bb: " << bb << " neighbors: " << neighListSize
                            << "(" << "%d" << ") externals: \"%s\"(%d) "
                            << "name: " << name << " radius: " << radius);
}

NodeContainer
RocketfuelTopologyReader::GenerateFromMapsFile (int argc, char *argv[])
{

      return nodes;
    }

  PrintNodeInfo (uid, loc, dns, bb, neigh_list.size (), name, radius);
  NS_LOG_INFO ("Load Node[" << uid << "]: location: " << loc << " dns: " << dns
                            << " bb: " << bb << " neighbors: " << neigh_list.size ()
                            << "(" << "%d" << ") externals: \"%s\"(%d) "
                            << "name: " << name << " radius: " << radius);

  //cast bb and dns to void, to suppress variable set but not used compiler warning
  //in optimized builds
  (void) bb;
  (void) dns;

  // Create node and link
  if (!uid.empty ())

  sname = argv[0];
  tname = argv[1];
  double v = strtod (argv[2], &endptr); // weight
  NS_UNUSED (v); // suppress "set but not used" compiler warning in optimized builds
  (void) v;
  if (*endptr != '\0')
    {
      NS_LOG_WARN ("invalid weight: " << argv[2]);

(-)a/src/wifi/model/wifi-information-element.cc (-3 lines)

Lines 55-63	Link Here

  // This IE was not optional, so confirm that we did actually

  // This IE was not optional, so confirm that we did actually

  // deserialise something.

  // deserialise something.

  NS_ASSERT (i.GetDistanceFrom (start) != 0);

  NS_ASSERT (i.GetDistanceFrom (start) != 0);

  // cast start to void, to suppress ‘start’ set but not used

  // compiler warning in optimized builds

  (void) start;

  return i;

  return i;




      bool found;
      found = ConstCast<Packet> (packet)->PeekPacketTag (tag);
      NS_ASSERT (found);
      // cast found to void, to suppress 'found' set but not used
      // compiler warning
      (void) found;
      return tag.GetDataMode ();
    }
  return DoGetDataMode (Lookup (address, header), fullPacketSize);

      bool found;
      found = ConstCast<Packet> (packet)->PeekPacketTag (tag);
      NS_ASSERT (found);
      // cast found to void, to suppress 'found' set but not used
      // compiler warning
      (void) found;
      return tag.GetRtsMode ();
    }
  return DoGetRtsMode (Lookup (address, header));

Return to bug 1170