From 0379ad69c100c59b094da3aba9476458c7fd4fde Mon Sep 17 00:00:00 2001 From: John Abraham Date: Wed, 18 May 2011 12:59:20 -0400 Subject: [PATCH] Bug 1162 - opt build examples module unused variables --- examples/energy/energy-model-example.cc | 3 +++ examples/stats/wifi-example-apps.cc | 3 +-- examples/wireless/multirate.cc | 5 +++++ examples/wireless/wifi-simple-interference.cc | 3 +++ src/applications/model/packet-sink.cc | 6 +++++- src/internet/test/ipv4-raw-test.cc | 6 ++++++ src/internet/test/udp-test.cc | 9 +++++++++ src/test/ns3wifi/wifi-interference-test-suite.cc | 3 +-- 8 files changed, 33 insertions(+), 5 deletions(-) diff --git a/examples/energy/energy-model-example.cc b/examples/energy/energy-model-example.cc index 6695c42ad..5730b0726 100644 --- a/examples/energy/energy-model-example.cc +++ b/examples/energy/energy-model-example.cc @@ -53,6 +53,9 @@ ReceivePacket (Ptr socket) NS_LOG_UNCOND ("--\nReceived one packet! Socket: "<< iaddr.GetIpv4 () << " port: " << iaddr.GetPort () << " at time = " << Simulator::Now ().GetSeconds () << "\n--"); + //cast iaddr to void, to suppress 'iaddr' set but not used compiler warning + //in optimized builds + (void) iaddr; } } } diff --git a/examples/stats/wifi-example-apps.cc b/examples/stats/wifi-example-apps.cc index 6f3158c0d..98f284ca9 100644 --- a/examples/stats/wifi-example-apps.cc +++ b/examples/stats/wifi-example-apps.cc @@ -242,9 +242,8 @@ Receiver::Receive(Ptr socket) Address from; while (packet = socket->RecvFrom(from)) { if (InetSocketAddress::IsMatchingType (from)) { - InetSocketAddress address = InetSocketAddress::ConvertFrom (from); NS_LOG_INFO ("Received " << packet->GetSize() << " bytes from " << - address.GetIpv4()); + InetSocketAddress::ConvertFrom (from).GetIpv4()); } TimestampTag timestamp; diff --git a/examples/wireless/multirate.cc b/examples/wireless/multirate.cc index 073de2a45..e2a4e2020 100644 --- a/examples/wireless/multirate.cc +++ b/examples/wireless/multirate.cc @@ -334,6 +334,11 @@ Experiment::ApplicationSetup (Ptr client, Ptr server, double start, << " position (" << clientPos.x << "," << clientPos.y << "," << clientPos.z << ")" << "\n"); + //cast serverPos,clientPos,iaddrClient to void, to suppress variable set but not + //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))); diff --git a/examples/wireless/wifi-simple-interference.cc b/examples/wireless/wifi-simple-interference.cc index e9c8a3a5f..acdc55f31 100644 --- a/examples/wireless/wifi-simple-interference.cc +++ b/examples/wireless/wifi-simple-interference.cc @@ -102,6 +102,9 @@ void ReceivePacket (Ptr socket) socket->GetSockName (addr); InetSocketAddress iaddr = InetSocketAddress::ConvertFrom (addr); NS_LOG_UNCOND ("Received one packet! Socket: " << iaddr.GetIpv4 () << " port: " << iaddr.GetPort ()); + //cast iaddr to void, to suppress iaddr set but not used compiler warning + //in optimized builds + (void) iaddr; } static void GenerateTraffic (Ptr socket, uint32_t pktSize, diff --git a/src/applications/model/packet-sink.cc b/src/applications/model/packet-sink.cc index e9027473b..0e966768c 100644 --- a/src/applications/model/packet-sink.cc +++ b/src/applications/model/packet-sink.cc @@ -165,9 +165,13 @@ void PacketSink::HandleRead (Ptr socket) if (InetSocketAddress::IsMatchingType (from)) { m_totalRx += packet->GetSize(); + InetSocketAddress address = InetSocketAddress::ConvertFrom (from); NS_LOG_INFO ("Received " << packet->GetSize() << " bytes from " << - address.GetIpv4() << " [" << InetSocketAddress::ConvertFrom (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); } diff --git a/src/internet/test/ipv4-raw-test.cc b/src/internet/test/ipv4-raw-test.cc index 97e8f88f9..e6ca8dda0 100644 --- a/src/internet/test/ipv4-raw-test.cc +++ b/src/internet/test/ipv4-raw-test.cc @@ -112,6 +112,9 @@ void Ipv4RawSocketImplTest::ReceivePkt (Ptr socket) NS_ASSERT (m_receivedPacket->GetSize () == 2); m_receivedPacket = socket->Recv (std::numeric_limits::max(), 0); NS_ASSERT (availableData == m_receivedPacket->GetSize ()); + //cast availableData to void, to suppress 'availableData' set but not used + //compiler warning + (void) availableData; } void Ipv4RawSocketImplTest::ReceivePkt2 (Ptr socket) @@ -122,6 +125,9 @@ void Ipv4RawSocketImplTest::ReceivePkt2 (Ptr socket) NS_ASSERT (m_receivedPacket2->GetSize () == 2); m_receivedPacket2 = socket->Recv (std::numeric_limits::max(), 0); NS_ASSERT (availableData == m_receivedPacket2->GetSize ()); + //cast availableData to void, to suppress 'availableData' set but not used + //compiler warning + (void) availableData; } void diff --git a/src/internet/test/udp-test.cc b/src/internet/test/udp-test.cc index 4d90ebae0..107053af7 100644 --- a/src/internet/test/udp-test.cc +++ b/src/internet/test/udp-test.cc @@ -94,6 +94,9 @@ void UdpSocketLoopbackTest::ReceivePkt (Ptr socket) availableData = socket->GetRxAvailable (); m_receivedPacket = socket->Recv (std::numeric_limits::max(), 0); NS_ASSERT (availableData == m_receivedPacket->GetSize ()); + //cast availableData to void, to suppress 'availableData' set but not used + //compiler warning + (void) availableData; } void @@ -152,6 +155,9 @@ void UdpSocketImplTest::ReceivePkt (Ptr socket) availableData = socket->GetRxAvailable (); m_receivedPacket = socket->Recv (std::numeric_limits::max(), 0); NS_ASSERT (availableData == m_receivedPacket->GetSize ()); + //cast availableData to void, to suppress 'availableData' set but not used + //compiler warning + (void) availableData; } void UdpSocketImplTest::ReceivePkt2 (Ptr socket) @@ -160,6 +166,9 @@ void UdpSocketImplTest::ReceivePkt2 (Ptr socket) availableData = socket->GetRxAvailable (); m_receivedPacket2 = socket->Recv (std::numeric_limits::max(), 0); NS_ASSERT (availableData == m_receivedPacket2->GetSize ()); + //cast availableData to void, to suppress 'availableData' set but not used + //compiler warning + (void) availableData; } void diff --git a/src/test/ns3wifi/wifi-interference-test-suite.cc b/src/test/ns3wifi/wifi-interference-test-suite.cc index 12a56c47e..bd53581d1 100644 --- a/src/test/ns3wifi/wifi-interference-test-suite.cc +++ b/src/test/ns3wifi/wifi-interference-test-suite.cc @@ -82,8 +82,7 @@ WifiInterferenceTestCase::ReceivePacket (Ptr socket) { Address addr; socket->GetSockName (addr); - InetSocketAddress iaddr = InetSocketAddress::ConvertFrom (addr); - NS_LOG_UNCOND ("Received one packet! Socket: " << iaddr.GetIpv4 () << " port: " << iaddr.GetPort ()); + NS_LOG_UNCOND ("Received one packet! Socket: " << InetSocketAddress::ConvertFrom (addr).GetIpv4 () << " port: " << iaddr.GetPort ()); } void