From 4182edbc93ac18e7cbf19320919aec506abcefad Mon Sep 17 00:00:00 2001
From: Tom Henderson <tomh@tomh.org>
Date: Tue, 27 May 2008 06:03:48 -0700
Subject: [PATCH] fix optimized build

---
 src/applications/packet-sink/packet-sink.cc  | 3 ++-
 src/applications/udp-echo/udp-echo-client.cc | 3 ++-
 src/applications/udp-echo/udp-echo-server.cc | 3 ++-
 src/internet-node/udp-socket-impl.cc         | 6 ++++--
 src/routing/olsr/olsr-agent-impl.cc          | 3 ++-
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/applications/packet-sink/packet-sink.cc b/src/applications/packet-sink/packet-sink.cc
index 3f4a9f27e..d73ca1f03 100644
--- a/src/applications/packet-sink/packet-sink.cc
+++ b/src/applications/packet-sink/packet-sink.cc
@@ -106,7 +106,8 @@ void PacketSink::HandleRead (Ptr<Socket> socket)
   while (packet = socket->Recv ())
     {
       SocketRxAddressTag tag;
-      bool found = packet->FindFirstMatchingTag (tag);
+      bool found;
+      found = packet->FindFirstMatchingTag (tag);
       NS_ASSERT (found);
       Address from = tag.GetAddress ();
       // XXX packet->RemoveTag (tag);
diff --git a/src/applications/udp-echo/udp-echo-client.cc b/src/applications/udp-echo/udp-echo-client.cc
index 787e2dcf7..7dd68701c 100644
--- a/src/applications/udp-echo/udp-echo-client.cc
+++ b/src/applications/udp-echo/udp-echo-client.cc
@@ -153,7 +153,8 @@ UdpEchoClient::HandleRead (Ptr<Socket> socket)
   while (packet = socket->Recv ())
     {
       SocketRxAddressTag tag;
-      bool found = packet->FindFirstMatchingTag (tag);
+      bool found;
+      found  = packet->FindFirstMatchingTag (tag);
       NS_ASSERT (found);
       Address from = tag.GetAddress ();
       // XXX packet->RemoveTag (tag);
diff --git a/src/applications/udp-echo/udp-echo-server.cc b/src/applications/udp-echo/udp-echo-server.cc
index e2dab0bf8..3851a88b7 100644
--- a/src/applications/udp-echo/udp-echo-server.cc
+++ b/src/applications/udp-echo/udp-echo-server.cc
@@ -98,7 +98,8 @@ UdpEchoServer::HandleRead (Ptr<Socket> socket)
   while (packet = socket->Recv ())
     {
       SocketRxAddressTag tag;
-      bool found = packet->FindFirstMatchingTag (tag); 
+      bool found;
+      found = packet->FindFirstMatchingTag (tag); 
       NS_ASSERT (found);
       Address from = tag.GetAddress ();
       // XXX packet->RemoveTag (tag);
diff --git a/src/internet-node/udp-socket-impl.cc b/src/internet-node/udp-socket-impl.cc
index 9f326246e..ae9e1f732 100644
--- a/src/internet-node/udp-socket-impl.cc
+++ b/src/internet-node/udp-socket-impl.cc
@@ -530,14 +530,16 @@ void UdpSocketImplTest::ReceivePacket2 (Ptr<Socket> socket, Ptr<Packet> packet,
 
 void UdpSocketImplTest::ReceivePkt (Ptr<Socket> socket)
 {
-  uint32_t availableData = socket->GetRxAvailable ();
+  uint32_t availableData;
+  availableData = socket->GetRxAvailable ();
   m_receivedPacket = socket->Recv (std::numeric_limits<uint32_t>::max(), 0);
   NS_ASSERT (availableData == m_receivedPacket->GetSize ());
 }
 
 void UdpSocketImplTest::ReceivePkt2 (Ptr<Socket> socket)
 {
-  uint32_t availableData = socket->GetRxAvailable ();
+  uint32_t availableData;
+  availableData = socket->GetRxAvailable ();
   m_receivedPacket2 = socket->Recv (std::numeric_limits<uint32_t>::max(), 0);
   NS_ASSERT (availableData == m_receivedPacket2->GetSize ());
 }
diff --git a/src/routing/olsr/olsr-agent-impl.cc b/src/routing/olsr/olsr-agent-impl.cc
index 56d4e8c76..2d240e897 100644
--- a/src/routing/olsr/olsr-agent-impl.cc
+++ b/src/routing/olsr/olsr-agent-impl.cc
@@ -312,7 +312,8 @@ AgentImpl::RecvOlsr (Ptr<Socket> socket)
   receivedPacket = socket->Recv ();
 
   SocketRxAddressTag tag;
-  bool found = receivedPacket->FindFirstMatchingTag (tag);
+  bool found;
+  found = receivedPacket->FindFirstMatchingTag (tag);
   NS_ASSERT (found);
   Address sourceAddress = tag.GetAddress ();