From ec4007ca27cb6a53d3141cb9a2d08793951a2edf Mon Sep 17 00:00:00 2001
From: Andrey Mazo <mazo@telum.ru>
Date: Mon, 21 Jan 2013 17:19:00 +0400
Subject: [PATCH] make non-static global debugging-only functions static inline
 (bug 1170).

Compilers shouldn't warn on unused static inline function and just don't emit code for
them in optimized builds.
Also debugging-only functions don't pollute symbol tables.
---
 examples/energy/energy-model-example.cc               | 2 +-
 examples/routing/manet-routing-compare.cc             | 2 +-
 examples/wireless/multirate.cc                        | 4 ++--
 examples/wireless/wifi-simple-interference.cc         | 4 ++--
 src/test/ns3wifi/wifi-interference-test-suite.cc      | 2 +-
 src/topology-read/model/rocketfuel-topology-reader.cc | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/examples/energy/energy-model-example.cc b/examples/energy/energy-model-example.cc
index 79f1210e7..a86e4c2c5 100644
--- a/examples/energy/energy-model-example.cc
+++ b/examples/energy/energy-model-example.cc
@@ -35,7 +35,7 @@ NS_LOG_COMPONENT_DEFINE ("EnergyExample");
 
 using namespace ns3;
 
-std::string
+static inline std::string
 PrintReceivedPacket (Address& from)
 {
   InetSocketAddress iaddr = InetSocketAddress::ConvertFrom (from);
diff --git a/examples/routing/manet-routing-compare.cc b/examples/routing/manet-routing-compare.cc
index 5fadf3978..1fa63cd23 100644
--- a/examples/routing/manet-routing-compare.cc
+++ b/examples/routing/manet-routing-compare.cc
@@ -119,7 +119,7 @@ RoutingExperiment::RoutingExperiment ()
 {
 }
 
-std::string
+static inline std::string
 PrintReceivedPacket (Ptr<Socket> socket, Ptr<Packet> packet)
 {
   SocketAddressTag tag;
diff --git a/examples/wireless/multirate.cc b/examples/wireless/multirate.cc
index ffb8c0d94..a458de543 100644
--- a/examples/wireless/multirate.cc
+++ b/examples/wireless/multirate.cc
@@ -309,14 +309,14 @@ Experiment::SendMultiDestinations (Ptr<Node> sender, NodeContainer c)
     }
 }
 
-Vector
+static inline Vector
 GetPosition (Ptr<Node> node)
 {
   Ptr<MobilityModel> mobility = node->GetObject<MobilityModel> ();
   return mobility->GetPosition ();
 }
 
-std::string
+static inline std::string
 PrintPosition (Ptr<Node> client, Ptr<Node> server)
 {
   Vector serverPos = GetPosition (server);
diff --git a/examples/wireless/wifi-simple-interference.cc b/examples/wireless/wifi-simple-interference.cc
index 59eadb9e4..9e5399338 100644
--- a/examples/wireless/wifi-simple-interference.cc
+++ b/examples/wireless/wifi-simple-interference.cc
@@ -96,7 +96,7 @@ NS_LOG_COMPONENT_DEFINE ("WifiSimpleInterference");
 
 using namespace ns3;
 
-std::string PrintReceivedPacket (Ptr<Socket> socket)
+static inline std::string PrintReceivedPacket (Ptr<Socket> socket)
 {
   Address addr;
   socket->GetSockName (addr);
@@ -108,7 +108,7 @@ std::string PrintReceivedPacket (Ptr<Socket> socket)
   return oss.str ();
 }
 
-void ReceivePacket (Ptr<Socket> socket)
+static void ReceivePacket (Ptr<Socket> socket)
 {
   NS_LOG_UNCOND (PrintReceivedPacket (socket));
 }
diff --git a/src/test/ns3wifi/wifi-interference-test-suite.cc b/src/test/ns3wifi/wifi-interference-test-suite.cc
index 69bdcd991..e21f6e4e2 100644
--- a/src/test/ns3wifi/wifi-interference-test-suite.cc
+++ b/src/test/ns3wifi/wifi-interference-test-suite.cc
@@ -77,7 +77,7 @@ WifiInterferenceTestCase::~WifiInterferenceTestCase ()
 {
 }
 
-std::string
+static inline std::string
 PrintReceivedPacket (Ptr<Socket> socket)
 {
   Address addr;
diff --git a/src/topology-read/model/rocketfuel-topology-reader.cc b/src/topology-read/model/rocketfuel-topology-reader.cc
index d0481488e..46a7c089d 100644
--- a/src/topology-read/model/rocketfuel-topology-reader.cc
+++ b/src/topology-read/model/rocketfuel-topology-reader.cc
@@ -77,7 +77,7 @@ int linksNumber = 0;
 int nodesNumber = 0;
 std::map<std::string, Ptr<Node> > nodeMap;
 
-void
+static inline void
 PrintNodeInfo (std::string & uid, std::string & loc, bool dns, bool bb,
                std::vector <std::string>::size_type neighListSize,
                std::string & name, int radius)