Attachment #189 for bug #245

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

(-)a/src/common/buffer.h (+1 lines)

Lines 520-525 private:	Link Here

520

#ifdef BUFFER_USE_INLINE

520

#ifdef BUFFER_USE_INLINE

521

522

#include "ns3/assert.h"

522

#include "ns3/assert.h"

523

#include <string.h>

523

524

namespace ns3 {

525

namespace ns3 {

525

526

(-)a/src/common/data-rate.cc (-2 / +7 lines)

Lines 29-35 DoParse (const std::string s, uint64_t *	Link Here

  std::string::size_type n = s.find_first_not_of("0123456789.");

  std::string::size_type n = s.find_first_not_of("0123456789.");

  if (n != std::string::npos)

  if (n != std::string::npos)

  { // Found non-numeric

  { // Found non-numeric

    double r = ::atof(s.substr(0, n).c_str());

    std::istringstream iss;

    iss.str (s.substr(0, n));

    double r;

    iss >> r;

    std::string trailer = s.substr(n, std::string::npos);

    std::string trailer = s.substr(n, std::string::npos);

    if (trailer == "bps")

    if (trailer == "bps")

Lines 117-123 DoParse (const std::string s, uint64_t *	Link Here

117

120

118

    return true;

121

    return true;

119

122

120

  *v = ::atoll(s.c_str());

123

  std::istringstream iss;

124

  iss.str (s);

125

  iss >> *v;

121

  return true;

126

  return true;

122

127

123

128

(-)a/src/common/tag-list.cc (+1 lines)

#include "tag-list.h"

#include "tag-list.h"

#include "ns3/log.h"

#include "ns3/log.h"

#include <vector>

#include <vector>

#include <string.h>

NS_LOG_COMPONENT_DEFINE ("TagList");

NS_LOG_COMPONENT_DEFINE ("TagList");

(-)a/src/contrib/config-store.cc (+1 lines)

Lines 8-13	Link Here

#include <fstream>

#include <fstream>

#include <iostream>

#include <iostream>

#include <unistd.h>

#include <unistd.h>

#include <stdlib.h>

NS_LOG_COMPONENT_DEFINE ("ConfigStore");

NS_LOG_COMPONENT_DEFINE ("ConfigStore");

(-)a/src/core/callback.h (+1 lines)

Lines 25-30	Link Here

#include "fatal-error.h"

#include "fatal-error.h"

#include "empty.h"

#include "empty.h"

#include "type-traits.h"

#include "type-traits.h"

#include <typeinfo>

namespace ns3 {

namespace ns3 {

(-)a/src/core/double.h (+1 lines)

Lines 23-28	Link Here

#include "attribute.h"

#include "attribute.h"

#include "attribute-helper.h"

#include "attribute-helper.h"

#include <stdint.h>

#include <stdint.h>

#include <limits>

namespace ns3 {

namespace ns3 {

(-)a/src/core/integer.h (+1 lines)

Lines 23-28	Link Here

#include "attribute.h"

#include "attribute.h"

#include "attribute-helper.h"

#include "attribute-helper.h"

#include <stdint.h>

#include <stdint.h>

#include <limits>

namespace ns3 {

namespace ns3 {

(-)a/src/core/uinteger.h (+1 lines)

Lines 23-28	Link Here

#include "attribute.h"

#include "attribute.h"

#include "attribute-helper.h"

#include "attribute-helper.h"

#include <stdint.h>

#include <stdint.h>

#include <limits>

namespace ns3 {

namespace ns3 {

(-)a/src/devices/wifi/status-code.h (+1 lines)

Lines 21-26	Link Here

#define STATUS_CODE_H

#define STATUS_CODE_H

#include <stdint.h>

#include <stdint.h>

#include <ostream>

#include "ns3/buffer.h"

#include "ns3/buffer.h"

namespace ns3 {

namespace ns3 {

(-)a/src/devices/wifi/supported-rates.h (+1 lines)

Lines 21-26	Link Here

#define SUPPORTED_RATES_H

#define SUPPORTED_RATES_H

#include <stdint.h>

#include <stdint.h>

#include <ostream>

#include "ns3/buffer.h"

#include "ns3/buffer.h"

namespace ns3 {

namespace ns3 {

(-)a/src/helper/internet-stack-helper.cc (+1 lines)

Lines 26-31	Link Here

#include "ns3/packet-socket-factory.h"

#include "ns3/packet-socket-factory.h"

#include "ns3/config.h"

#include "ns3/config.h"

#include "ns3/simulator.h"

#include "ns3/simulator.h"

#include <limits>

namespace ns3 {

namespace ns3 {

(-)a/src/helper/olsr-helper.h (-1 / +1 lines)

Lines 39-45 public:	Link Here

*/

*/

  void SetAgent (std::string tid,

  void SetAgent (std::string tid,

		 std::string n0 = "", const AttributeValue &v0 = EmptyAttributeValue (),

		 std::string n0 = "", const AttributeValue &v0 = EmptyAttributeValue (),

		 std::string n1 = "", const AttributeValue &v2 = EmptyAttributeValue (),

		 std::string n1 = "", const AttributeValue &v1 = EmptyAttributeValue (),

		 std::string n2 = "", const AttributeValue &v2 = EmptyAttributeValue (),

		 std::string n2 = "", const AttributeValue &v2 = EmptyAttributeValue (),

		 std::string n3 = "", const AttributeValue &v3 = EmptyAttributeValue (),

		 std::string n3 = "", const AttributeValue &v3 = EmptyAttributeValue (),

		 std::string n4 = "", const AttributeValue &v4 = EmptyAttributeValue (),

		 std::string n4 = "", const AttributeValue &v4 = EmptyAttributeValue (),

(-)a/src/internet-stack/sgi-hashmap.h (-1 / +7 lines)

Lines 20-27 namespace sgi = ::__gnu_cxx; // GC	Link Here

namespace sgi = ::__gnu_cxx;       // GCC 3.1 and later

namespace sgi = ::__gnu_cxx;       // GCC 3.1 and later

       #endif

       #endif

     #else  // gcc 4.x and later

     #else  // gcc 4.x and later

       #if __GNUC_MINOR__ < 3

       #include <ext/hash_map>

       #include <ext/hash_map>

       namespace sgi = ::__gnu_cxx;

namespace sgi = ::__gnu_cxx;

       #else

#undef __DEPRECATED

       #include <backward/hash_map>

namespace sgi = ::__gnu_cxx;

       #endif

     #endif

     #endif

  #endif

  #endif

#else      // ...  there are other compilers, right?

#else      // ...  there are other compilers, right?

(-)a/src/node/address.cc (+1 lines)

Lines 1-5	Link Here

#include "ns3/assert.h"

#include "ns3/assert.h"

#include "address.h"

#include "address.h"

#include <string.h>

#include <iostream>

#include <iostream>

#include <iomanip>

#include <iomanip>

(-)a/src/node/mac48-address.cc (+1 lines)

Lines 22-27	Link Here

#include "ns3/assert.h"

#include "ns3/assert.h"

#include <iomanip>

#include <iomanip>

#include <iostream>

#include <iostream>

#include <string.h>

namespace ns3 {

namespace ns3 {

(-)a/src/node/mac64-address.cc (+1 lines)

Lines 22-27	Link Here

#include "ns3/assert.h"

#include "ns3/assert.h"

#include <iomanip>

#include <iomanip>

#include <iostream>

#include <iostream>

#include <string.h>

namespace ns3 {

namespace ns3 {

(-)a/src/node/socket.cc (+1 lines)

Lines 25-30	Link Here

#include "node.h"

#include "node.h"

#include "socket.h"

#include "socket.h"

#include "socket-factory.h"

#include "socket-factory.h"

#include <limits>

NS_LOG_COMPONENT_DEFINE ("Socket");

NS_LOG_COMPONENT_DEFINE ("Socket");

(-)a/src/routing/global-routing/global-route-manager-impl.cc (+1 lines)

Lines 1425-1430 GlobalRouteManagerImpl::SPFVertexAddPare	Link Here

1425

1426

#include "ns3/test.h"

1426

#include "ns3/test.h"

1427

#include "ns3/simulator.h"

1427

#include "ns3/simulator.h"

1428

#include <stdlib.h>

1428

1429

namespace ns3 {

1430

namespace ns3 {

1430

1431

(-)a/src/simulator/time.cc (-2 / +9 lines)

Lines 72-78 TimeUnit<1>::TimeUnit(const std::string&	Link Here

  std::string::size_type n = s.find_first_not_of("0123456789.");

  std::string::size_type n = s.find_first_not_of("0123456789.");

  if (n != std::string::npos)

  if (n != std::string::npos)

  { // Found non-numeric

  { // Found non-numeric

    double r = atof(s.substr(0, n).c_str());

    std::istringstream iss;

    iss.str (s.substr(0, n));

    double r;

    iss >> r;

    std::string trailer = s.substr(n, std::string::npos);

    std::string trailer = s.substr(n, std::string::npos);

    if (trailer == std::string("s"))

    if (trailer == std::string("s"))

Lines 113-119 TimeUnit<1>::TimeUnit(const std::string&	Link Here

113

116

114

  //else

117

  //else

115

  //they didn't provide units, assume seconds

118

  //they didn't provide units, assume seconds

116

  m_data = HighPrecision (atof(s.c_str()) * TimeStepPrecision::g_tsPrecFactor);

119

  std::istringstream iss;

120

  iss. str (s);

121

  double v;

122

  iss >> v;

123

  m_data = HighPrecision (v * TimeStepPrecision::g_tsPrecFactor);

117

124

118

125

119

double

126

double

(-)a/utils/bench-packets.cc (-1 / +4 lines)

Lines 23-28	Link Here

#include <iostream>

#include <iostream>

#include <sstream>

#include <sstream>

#include <string>

#include <string>

#include <stdlib.h>

using namespace ns3;

using namespace ns3;

Lines 261-267 int main (int argc, char *argv[])	Link Here

261

      if (strncmp ("--n=", argv[0],strlen ("--n=")) == 0)

262

      if (strncmp ("--n=", argv[0],strlen ("--n=")) == 0)

262

263

          char const *nAscii = argv[0] + strlen ("--n=");

264

          char const *nAscii = argv[0] + strlen ("--n=");

264

          n = atoi (nAscii);

265

          std::istringstream iss;

266

          iss.str (nAscii);

267

          iss >> n;

265

268

266

      argc--;

269

      argc--;

267

      argv++;

270

      argv++;

(-)a/utils/bench-simulator.cc (+1 lines)

Lines 23-28	Link Here

#include <iostream>

#include <iostream>

#include <fstream>

#include <fstream>

#include <vector>

#include <vector>

#include <string.h>

using namespace ns3;

using namespace ns3;

(-)a/utils/replay-simulation.cc (+1 lines)

Lines 24-29	Link Here

#include <deque>

#include <deque>

#include <fstream>

#include <fstream>

#include <iostream>

#include <iostream>

#include <string.h>

using namespace ns3;

using namespace ns3;

Return to bug 245