Attachment #1154 for bug #1170

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

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

Lines 53-61	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

          NS_UNUSED (iaddr); // suppress "set but not used" compiler warning in optimized builds

          //in optimized builds

          (void) iaddr;




  NS_LOG_DEBUG("Set up Server Device " <<  (server->GetDevice(0))->GetAddress () 
                                       << " with ip " << ipv4AddrServer
                                       << " position (" << serverPos.x << "," << serverPos.y << "," << serverPos.z << ")");
  NS_UNUSED (serverPos); // suppress "set but not used" compiler warning in optimized builds

  NS_LOG_DEBUG("Set up Client Device " <<  (client->GetDevice(0))->GetAddress () 
                                       << " with ip " << ipv4AddrClient
                                       << " position (" << clientPos.x << "," << clientPos.y << "," << clientPos.z << ")"
                                       << "\n");
  NS_UNUSED (ipv4AddrClient); // suppress "set but not used" compiler warning in optimized builds
  NS_UNUSED (clientPos); // suppress "set but not used" compiler warning in optimized builds
  //used compiler warning in optimized builds
  (void) serverPos;
  (void) clientPos;
  (void) ipv4AddrClient;

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

(-)a/examples/wireless/wifi-simple-interference.cc (-3 / +1 lines)

Lines 102-110	Link Here

102

  socket->GetSockName (addr);

102

  socket->GetSockName (addr);

103

  InetSocketAddress iaddr = InetSocketAddress::ConvertFrom (addr);

103

  InetSocketAddress iaddr = InetSocketAddress::ConvertFrom (addr);

104

  NS_LOG_UNCOND ("Received one packet!  Socket: " << iaddr.GetIpv4 () << " port: " << iaddr.GetPort ());

104

  NS_LOG_UNCOND ("Received one packet!  Socket: " << iaddr.GetIpv4 () << " port: " << iaddr.GetPort ());

105

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

105

  NS_UNUSED (iaddr); // suppress "set but not used" compiler warning in optimized builds

106

  //in optimized builds

107

  (void) iaddr;

108

106

109

107

110

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

108

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




#include "ns3/address.h"
#include "ns3/address-utils.h"
#include "ns3/log.h"
#include "ns3/unused.h"
#include "ns3/inet-socket-address.h"
#include "ns3/node.h"
#include "ns3/socket.h"

          NS_LOG_INFO ("Received " << packet->GetSize() << " bytes from " << 
                       address.GetIpv4() << " [" << address << "]" 
                                   << " total Rx " << m_totalRx);
          NS_UNUSED (address); // suppress "set but not used" compiler warning in optimized builds
          //compiler warning in optimized builds
          (void) address;
        }
      m_rxTrace (packet, from);
    }




#include "ns3/icmpv4.h"
#include "ns3/assert.h"
#include "ns3/log.h"
#include "ns3/unused.h"
#include "ns3/ipv4-address.h"
#include "ns3/socket.h"
#include "ns3/uinteger.h"

  InetSocketAddress dst = InetSocketAddress (m_remote, 0);
  status = m_socket->Connect (dst);
  NS_ASSERT (status != -1);
  NS_UNUSED (status); // suppress "set but not used" compiler warning in optimized builds
  //in optimized builds
  (void) status;

  Send ();
}





#include "ns3/assert.h"
#include "ns3/log.h"
#include "ns3/unused.h"
#include "ns3/object.h"
#include "ns3/names.h"
#include "ns3/ipv4.h"

          // 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\"");
          NS_UNUSED (result);
        }

      g_interfaceStreamMapIpv4[std::make_pair (ipv4, interface)] = theStream;




/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
#include "ns3/callback.h"
#include "ns3/assert.h"
#include "ns3/unused.h"
#include <iostream>

using namespace ns3;

  // invoke cbOne function through callback instance
  double retOne;
  retOne = one (10.0, 20.0);
  NS_UNUSED (retOne); // suppress "set but not used" compiler warning in optimized builds
  // not used compiler warning
  (void) retOne; 

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

  // invoke MyCb::cbTwo through callback instance
  int retTwo;
  retTwo = two (10.0);
  NS_UNUSED (retTwo); // suppress "set but not used" compiler warning in optimized builds

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

(-)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 lines)

Lines 235-240	Link Here

235

        'model/vector.h',

235

        'model/vector.h',

236

        'model/default-deleter.h',

236

        'model/default-deleter.h',

237

        'model/fatal-impl.h',

237

        'model/fatal-impl.h',

238

        'model/unused.h',

238

239

240

    if sys.platform == 'win32':

241

    if sys.platform == 'win32':




#include "ns3/packet.h"
#include "ns3/flow-monitor.h"
#include "ns3/log.h"
#include "ns3/unused.h"
#include "ns3/pointer.h"
#include "ns3/config.h"
#include "ns3/flow-id-tag.h"

  bool tagFound;
  tagFound = ConstCast<Packet> (ipPayload)->RemovePacketTag (fTag);
  NS_ASSERT_MSG (tagFound, "FlowProbeTag is missing");
  NS_UNUSED (tagFound); // suppress "set but not used" compiler warning in optimized builds

  (void) tagFound;
  FlowId flowId = fTag.GetFlowId ();
  FlowPacketId packetId = fTag.GetPacketId ();
  uint32_t size = fTag.GetPacketSize ();





#include "ns3/assert.h"
#include "ns3/log.h"
#include "ns3/unused.h"
#include "ns3/object.h"
#include "ns3/names.h"
#include "ns3/ipv4.h"

      result = ipv4L3Protocol->TraceConnectWithoutContext ("Rx", MakeCallback (&Ipv4L3ProtocolRxTxSink));
      NS_ASSERT_MSG (result == true, "InternetStackHelper::EnablePcapIpv4Internal():  "
                     "Unable to connect ipv4L3Protocol \"Rx\"");
      NS_UNUSED (result); // suppress "set but not used" compiler warning in optimized builds
      // 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\"");
      NS_UNUSED (result); // suppress "set but not used" compiler warning in optimized builds
      // 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::EanableAsciiIpv4Internal():  "
                         "Unable to connect ipv4L3Protocol \"Drop\"");
          NS_UNUSED (result);
        }

      g_interfaceStreamMapIpv4[std::make_pair (ipv4, interface)] = theStream;

          // 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\"");
          NS_UNUSED (result);
        }

      g_interfaceStreamMapIpv6[std::make_pair (ipv6, interface)] = theStream;




#include "ns3/node.h"
#include "ns3/inet-socket-address.h"
#include "ns3/log.h"
#include "ns3/unused.h"
#include "ns3/ipv4.h"
#include "ns3/ipv4-interface-address.h"
#include "ns3/ipv4-route.h"

      bool found;
      found = packet->PeekPacketTag (tag);
      NS_ASSERT (found);
      NS_UNUSED (found); // suppress "set but not used" compiler warning in optimized builds
      //in optimized builds
      (void) found;
      fromAddress = tag.GetAddress ();
    }
  return packet;




 */

#include "ns3/log.h"
#include "ns3/unused.h"
#include "ns3/node.h"
#include "ns3/inet-socket-address.h"
#include "ns3/ipv4-route.h"

      bool found;
      found = packet->PeekPacketTag (tag);
      NS_ASSERT (found);
      NS_UNUSED (found); // suppress "set but not used" compiler warning in optimized builds
      //in optimized builds
      (void) found;
      fromAddress = tag.GetAddress ();
    }
  return packet;




#include "ns3/socket.h"

#include "ns3/log.h"
#include "ns3/unused.h"
#include "ns3/node.h"
#include "ns3/inet-socket-address.h"
#include "ns3/boolean.h"

  NS_ASSERT (m_receivedPacket->GetSize () == 2);
  m_receivedPacket = socket->Recv (std::numeric_limits<uint32_t>::max(), 0);
  NS_ASSERT (availableData == m_receivedPacket->GetSize ());
  NS_UNUSED (availableData); // suppress "set but not used" compiler warning in optimized builds
  //compiler warning
  (void) availableData;
}

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

  NS_ASSERT (m_receivedPacket2->GetSize () == 2);
  m_receivedPacket2 = socket->Recv (std::numeric_limits<uint32_t>::max(), 0);
  NS_ASSERT (availableData == m_receivedPacket2->GetSize ());
  NS_UNUSED (availableData); // suppress "set but not used" compiler warning in optimized builds
  //compiler warning
  (void) availableData;
}

void




#include "ns3/socket.h"

#include "ns3/log.h"
#include "ns3/unused.h"
#include "ns3/node.h"
#include "ns3/inet-socket-address.h"


  availableData = socket->GetRxAvailable ();
  m_receivedPacket = socket->Recv (std::numeric_limits<uint32_t>::max(), 0);
  NS_ASSERT (availableData == m_receivedPacket->GetSize ());
  NS_UNUSED (availableData); // suppress "set but not used" compiler warning in optimized builds
  //compiler warning
  (void) availableData;
}

void

  availableData = socket->GetRxAvailable ();
  m_receivedPacket = socket->Recv (std::numeric_limits<uint32_t>::max(), 0);
  NS_ASSERT (availableData == m_receivedPacket->GetSize ());
  NS_UNUSED (availableData); // suppress "set but not used" compiler warning in optimized builds
  //compiler warning
  (void) availableData;
}

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

  availableData = socket->GetRxAvailable ();
  m_receivedPacket2 = socket->Recv (std::numeric_limits<uint32_t>::max(), 0);
  NS_ASSERT (availableData == m_receivedPacket2->GetSize ());
  NS_UNUSED (availableData); // suppress "set but not used" compiler warning in optimized builds
  //compiler warning
  (void) availableData;
}

void




#include "ns3/simulator.h"
#include "ns3/assert.h"
#include "ns3/log.h"
#include "ns3/unused.h"
#include "ns3/random-variable.h"
#include "ns3/mesh-wifi-interface-mac.h"
#include "ns3/mesh-wifi-interface-mac-plugin.h"

  NS_ASSERT (iface != m_peerLinks.end ());
  PeerManagementProtocolMacMap::const_iterator plugin = m_plugins.find (interface);
  NS_ASSERT (plugin != m_plugins.end ());
  NS_UNUSED (plugin); // suppress "set but not used" compiler warning in optimized builds
  // in optimized builds
  (void) plugin;
  std::map<uint32_t, Time>::const_iterator lastBeacon = m_lastBeacon.find (interface);
  std::map<uint32_t, Time>::const_iterator beaconInterval = m_beaconInterval.find (interface);
  if ((lastBeacon == m_lastBeacon.end ()) || (beaconInterval == m_beaconInterval.end ()))

(-)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 400-407	Link Here

400

401

  char *endp;

402

  char *endp;

402

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

403

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

403

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

404

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

404

  (void) v;

405

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

405

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

406

407




#define TRACE_HELPER_H

#include "ns3/assert.h"
#include "ns3/unused.h"
#include "ns3/net-device-container.h"
#include "ns3/node-container.h"
#include "ns3/simulator.h"

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 << "\"");
  NS_UNUSED (result);
}

/**

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 << "\"");
  NS_UNUSED (result);
}

template <typename T> void

  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 << "\"");
  NS_UNUSED (result);
}

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 << "\"");
  NS_UNUSED (result);
}

template <typename T> void

  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 << "\"");
  NS_UNUSED (result);
}

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 << "\"");
  NS_UNUSED (result);
}

template <typename T> void

  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 << "\"");
  NS_UNUSED (result);
}

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 << "\"");
  NS_UNUSED (result);
}

template <typename T> void

  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 << "\"");
  NS_UNUSED (result);
}

/**




 */

#include "ns3/log.h"
#include "ns3/unused.h"
#include "ns3/packet.h"
#include "node.h"
#include "socket.h"

            }
        }
      NS_ASSERT_MSG (found, "Socket cannot be bound to a NetDevice not existing on the Node");
      NS_UNUSED (found); // suppress "set but not used" compiler warning in optimized builds
      //in optimized builds
      (void) found;
    }
  m_boundnetdevice = netdevice;
  return;




#include "packet-socket.h"
#include "packet-socket-address.h"
#include "ns3/log.h"
#include "ns3/unused.h"
#include "ns3/node.h"
#include "ns3/packet.h"
#include "ns3/uinteger.h"

      bool found;
      found = packet->PeekPacketTag (tag);
      NS_ASSERT (found);
      NS_UNUSED (found); // suppress "set but not used" compiler warning in optimized builds
      //in optimized builds
      (void) found;
      fromAddress = tag.GetAddress ();
    }
  return packet;




#include <iomanip>
#include <math.h>
#include "ns3/log.h"
#include "ns3/unused.h"
#include "radiotap-header.h"

NS_LOG_COMPONENT_DEFINE ("RadiotapHeader");

{
  NS_LOG_FUNCTION (this);

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

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




#include <string>

#include "ns3/log.h"
#include "ns3/unused.h"
#include "ns3/callback.h"
#include "ns3/abort.h"
#include "ns3/test.h"

  socket->GetSockName (addr);
  InetSocketAddress iaddr = InetSocketAddress::ConvertFrom (addr);
  NS_LOG_UNCOND ("Received one packet!  Socket: " << iaddr.GetIpv4 () << " port: " << iaddr.GetPort ());
  NS_UNUSED (iaddr); // suppress "set but not used" compiler warning in optimized builds
  //in optimized builds
  (void) iaddr;
}

void 




#include <regex.h>

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

namespace ns3 {

                            << " bb: " << bb << " neighbors: " << neigh_list.size ()
                            << "(" << "%d" << ") externals: \"%s\"(%d) "
                            << "name: " << name << " radius: " << radius);
  NS_UNUSED (bb); // suppress "set but not used" compiler warning in optimized builds
  NS_UNUSED (dns); // suppress "set but not used" compiler warning in optimized builds
  //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]);




 */

#include "ns3/wifi-information-element.h"
#include "ns3/unused.h"

namespace ns3 {


  // This IE was not optional, so confirm that we did actually
  // deserialise something.
  NS_ASSERT (i.GetDistanceFrom (start) != 0);
  NS_UNUSED (start); // suppress "set but not used" compiler warning in optimized builds
  // compiler warning in optimized builds
  (void) start;
  return i;
}





#include "ns3/simulator.h"
#include "ns3/assert.h"
#include "ns3/log.h"
#include "ns3/unused.h"
#include "ns3/tag.h"
#include "ns3/boolean.h"
#include "ns3/double.h"

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

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

Return to bug 1170