Attachment #1502 for bug #1170

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

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

Lines 35-41	Link Here

using namespace ns3;

using namespace ns3;

std::string

static inline std::string

PrintReceivedPacket (Address& from)

PrintReceivedPacket (Address& from)

  InetSocketAddress iaddr = InetSocketAddress::ConvertFrom (from);

  InetSocketAddress iaddr = InetSocketAddress::ConvertFrom (from);

(-)a/examples/routing/manet-routing-compare.cc (-1 / +1 lines)

Lines 119-125	Link Here

119

120

121

122

std::string

122

static inline std::string

123

PrintReceivedPacket (Ptr<Socket> socket, Ptr<Packet> packet)

123

PrintReceivedPacket (Ptr<Socket> socket, Ptr<Packet> packet)

124

125

  SocketAddressTag tag;

125

  SocketAddressTag tag;




    }
}

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

static inline std::string
PrintPosition (Ptr<Node> client, Ptr<Node> server)
{
  Vector serverPos = GetPosition (server);

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

Lines 96-102	Link Here

using namespace ns3;

using namespace ns3;

std::string PrintReceivedPacket (Ptr<Socket> socket)

static inline std::string PrintReceivedPacket (Ptr<Socket> socket)

100

101

  Address addr;

101

  Address addr;

102

  socket->GetSockName (addr);

102

  socket->GetSockName (addr);

Lines 108-114	Link Here

108

  return oss.str ();

108

  return oss.str ();

109

110

111

void ReceivePacket (Ptr<Socket> socket)

111

static void ReceivePacket (Ptr<Socket> socket)

112

113

  NS_LOG_UNCOND (PrintReceivedPacket (socket));

113

  NS_LOG_UNCOND (PrintReceivedPacket (socket));

114

(-)a/src/test/ns3wifi/wifi-interference-test-suite.cc (-1 / +1 lines)

Lines 77-83	Link Here

std::string

static inline std::string

PrintReceivedPacket (Ptr<Socket> socket)

PrintReceivedPacket (Ptr<Socket> socket)

  Address addr;

  Address addr;

(-)a/src/topology-read/model/rocketfuel-topology-reader.cc (-1 / +1 lines)

Lines 77-83	Link Here

int nodesNumber = 0;

int nodesNumber = 0;

std::map<std::string, Ptr<Node> > nodeMap;

std::map<std::string, Ptr<Node> > nodeMap;

void

static inline void

PrintNodeInfo (std::string & uid, std::string & loc, bool dns, bool bb,

PrintNodeInfo (std::string & uid, std::string & loc, bool dns, bool bb,

               std::vector <std::string>::size_type neighListSize,

               std::vector <std::string>::size_type neighListSize,

               std::string & name, int radius)

               std::string & name, int radius)

Return to bug 1170