Attachment #98 for bug #121

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

(-)a/examples/csma-broadcast.cc (-1 / +1 lines)

Lines 63-69 NS_LOG_COMPONENT_DEFINE ("CsmaBroadcastE	Link Here

NS_LOG_COMPONENT_DEFINE ("CsmaBroadcastExample");

NS_LOG_COMPONENT_DEFINE ("CsmaBroadcastExample");

int

int

main (int argc, char *argv[])

main (int argc, const char *argv[])

  // Users may find it convenient to turn on explicit debugging

  // Users may find it convenient to turn on explicit debugging

  // for selected modules; the below lines suggest how to do this

  // for selected modules; the below lines suggest how to do this

(-)a/examples/csma-multicast.cc (-1 / +1 lines)

Lines 58-64 NS_LOG_COMPONENT_DEFINE ("CsmaMulticastE	Link Here

NS_LOG_COMPONENT_DEFINE ("CsmaMulticastExample");

NS_LOG_COMPONENT_DEFINE ("CsmaMulticastExample");

int

int

main (int argc, char *argv[])

main (int argc, const char *argv[])

//

//

// Users may find it convenient to turn on explicit debugging

// Users may find it convenient to turn on explicit debugging

(-)a/examples/csma-one-subnet.cc (-1 / +1 lines)

Lines 53-59 NS_LOG_COMPONENT_DEFINE ("CsmaOneSubnetE	Link Here

NS_LOG_COMPONENT_DEFINE ("CsmaOneSubnetExample");

NS_LOG_COMPONENT_DEFINE ("CsmaOneSubnetExample");

int

int

main (int argc, char *argv[])

main (int argc, const char *argv[])

//

//

// Users may find it convenient to turn on explicit debugging

// Users may find it convenient to turn on explicit debugging

(-)a/examples/csma-packet-socket.cc (-1 / +1 lines)

Lines 69-75 CreateCsmaDevice (Ptr<Node> node, Ptr<Cs	Link Here

int

int

main (int argc, char *argv[])

main (int argc, const char *argv[])

#if 0

#if 0

  LogComponentEnable ("CsmaPacketSocketExample", LOG_LEVEL_INFO);

  LogComponentEnable ("CsmaPacketSocketExample", LOG_LEVEL_INFO);

(-)a/examples/mixed-global-routing.cc (-1 / +1 lines)

Lines 71-77 NS_LOG_COMPONENT_DEFINE ("MixedGlobalRou	Link Here

NS_LOG_COMPONENT_DEFINE ("MixedGlobalRoutingExample");

NS_LOG_COMPONENT_DEFINE ("MixedGlobalRoutingExample");

int

int

main (int argc, char *argv[])

main (int argc, const char *argv[])

  // Users may find it convenient to turn on explicit debugging

  // Users may find it convenient to turn on explicit debugging

(-)a/examples/simple-alternate-routing.cc (-1 / +1 lines)

Lines 68-74 NS_LOG_COMPONENT_DEFINE ("SimpleAlternat	Link Here

NS_LOG_COMPONENT_DEFINE ("SimpleAlternateRoutingExample");

NS_LOG_COMPONENT_DEFINE ("SimpleAlternateRoutingExample");

int

int

main (int argc, char *argv[])

main (int argc, const char *argv[])

  // Users may find it convenient to turn on explicit debugging

  // Users may find it convenient to turn on explicit debugging

  // for selected modules; the below lines suggest how to do this

  // for selected modules; the below lines suggest how to do this

(-)a/examples/simple-error-model.cc (-1 / +1 lines)

Lines 71-77 NS_LOG_COMPONENT_DEFINE ("SimpleErrorMod	Link Here

NS_LOG_COMPONENT_DEFINE ("SimpleErrorModelExample");

NS_LOG_COMPONENT_DEFINE ("SimpleErrorModelExample");

int

int

main (int argc, char *argv[])

main (int argc, const char *argv[])

  // Users may find it convenient to turn on explicit debugging

  // Users may find it convenient to turn on explicit debugging

  // for selected modules; the below lines suggest how to do this

  // for selected modules; the below lines suggest how to do this

(-)a/examples/simple-global-routing.cc (-1 / +1 lines)

Lines 73-79 NS_LOG_COMPONENT_DEFINE ("SimpleGlobalRo	Link Here

NS_LOG_COMPONENT_DEFINE ("SimpleGlobalRoutingExample");

NS_LOG_COMPONENT_DEFINE ("SimpleGlobalRoutingExample");

int

int

main (int argc, char *argv[])

main (int argc, const char *argv[])

  // Users may find it convenient to turn on explicit debugging

  // Users may find it convenient to turn on explicit debugging

  // for selected modules; the below lines suggest how to do this

  // for selected modules; the below lines suggest how to do this

(-)a/examples/simple-point-to-point-olsr.cc (-1 / +1 lines)

Lines 68-74 NS_LOG_COMPONENT_DEFINE ("SimplePointToP	Link Here

NS_LOG_COMPONENT_DEFINE ("SimplePointToPointExample");

NS_LOG_COMPONENT_DEFINE ("SimplePointToPointExample");

int

int

main (int argc, char *argv[])

main (int argc, const char *argv[])

  // Users may find it convenient to turn on explicit debugging

  // Users may find it convenient to turn on explicit debugging

  // for selected modules; the below lines suggest how to do this

  // for selected modules; the below lines suggest how to do this

(-)a/examples/simple-point-to-point.cc (-1 / +1 lines)

Lines 67-73 NS_LOG_COMPONENT_DEFINE ("SimplePointToP	Link Here

NS_LOG_COMPONENT_DEFINE ("SimplePointToPointExample");

NS_LOG_COMPONENT_DEFINE ("SimplePointToPointExample");

int

int

main (int argc, char *argv[])

main (int argc, const char *argv[])

  // Users may find it convenient to turn on explicit debugging

  // Users may find it convenient to turn on explicit debugging

  // for selected modules; the below lines suggest how to do this

  // for selected modules; the below lines suggest how to do this

(-)a/examples/udp-echo.cc (-1 / +1 lines)

Lines 53-59 NS_LOG_COMPONENT_DEFINE ("UdpEchoExample	Link Here

NS_LOG_COMPONENT_DEFINE ("UdpEchoExample");

NS_LOG_COMPONENT_DEFINE ("UdpEchoExample");

int

int

main (int argc, char *argv[])

main (int argc, const char *argv[])

//

//

// Users may find it convenient to turn on explicit debugging

// Users may find it convenient to turn on explicit debugging

(-)a/samples/main-adhoc-wifi.cc (-1 / +1 lines)

Lines 139-145 RunOneExperiment (void)	Link Here

139

  Simulator::Destroy ();

139

  Simulator::Destroy ();

140

141

142

int main (int argc, char *argv[])

142

int main (int argc, const char *argv[])

143

144

  Simulator::SetLinkedList ();

144

  Simulator::SetLinkedList ();

145

(-)a/samples/main-default-value.cc (-1 / +1 lines)

Lines 48-54 TestClass::TestClass () :	Link Here

using std::cout;

using std::cout;

int main (int argc, char* argv[])

int main (int argc, const char* argv[])

  //The following allows the default values established so far to be hooked

  //The following allows the default values established so far to be hooked

  //into the command line argument processing unit.  Essentially, the command

  //into the command line argument processing unit.  Essentially, the command

(-)a/samples/main-grid-topology.cc (-1 / +1 lines)

Lines 8-14	Link Here

using namespace ns3;

using namespace ns3;

int main (int argc, char *argv[])

int main (int argc, const char *argv[])

  CommandLine::Parse (argc, argv);

  CommandLine::Parse (argc, argv);

(-)a/samples/main-random-topology.cc (-1 / +1 lines)

Lines 22-28 CourseChange (const TraceContext &contex	Link Here

            << ", z=" << pos.z << std::endl;

            << ", z=" << pos.z << std::endl;

int main (int argc, char *argv[])

int main (int argc, const char *argv[])

  DefaultValue::Bind ("RandomDiscPositionX", "100");

  DefaultValue::Bind ("RandomDiscPositionX", "100");

  DefaultValue::Bind ("RandomDiscPositionY", "50");

  DefaultValue::Bind ("RandomDiscPositionY", "50");

(-)a/samples/main-random-walk.cc (-1 / +1 lines)

Lines 25-31 CourseChange (ns3::TraceContext const&,	Link Here

            << ", z=" << vel.z << std::endl;

            << ", z=" << vel.z << std::endl;

int main (int argc, char *argv[])

int main (int argc, const char *argv[])

  DefaultValue::Bind ("RandomWalk2dMode", "Time");

  DefaultValue::Bind ("RandomWalk2dMode", "Time");

  DefaultValue::Bind ("RandomWalk2dTime", "2s");

  DefaultValue::Bind ("RandomWalk2dTime", "2s");




}

void 
CommandLine::Parse (int argc, const char *argv[])
{
  for (argc--, argv++; argc > 0; argc--, argv++)
    {

    std::ostringstream nullout;
    std::streambuf *origcerr = std::cerr.rdbuf (nullout.rdbuf ());
    {
      const char *argv[] = {"run-tests", "--loops", "bad-value", NULL};
      int argc = sizeof (argv) / sizeof (argv[0]) - 1;
      
      uint32_t loops = 123;

    }

    {
      const char *argv[] = {"run-tests", "--loops=bad-value", NULL};
      int argc = sizeof (argv) / sizeof (argv[0]) - 1;
      
      uint32_t loops = 123;

    }

    {
      const char *argv[] = {"run-tests", "--loops", "456", NULL};
      int argc = sizeof (argv) / sizeof (argv[0]) - 1;
      
      uint32_t loops = 123;

    }

    {
      const char *argv[] = {"run-tests", "--loops=456", NULL};
      int argc = sizeof (argv) / sizeof (argv[0]) - 1;
      
      uint32_t loops = 123;

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

Lines 69-75 public:	Link Here

   * \param argv Array of strings passed in as arguments; pass this directly from

   * \param argv Array of strings passed in as arguments; pass this directly from

   * the second argument of your main(int,char**) function

   * the second argument of your main(int,char**) function

*/

*/

  static void Parse (int argc, char *argv[]);

  static void Parse (int argc, const char *argv[]);

 private:

 private:

  template <typename T>

  template <typename T>

  class UserDefaultValue : public DefaultValueBase

  class UserDefaultValue : public DefaultValueBase

(-)a/utils/mobility-visualizer-model.cc (-1 / +1 lines)

Lines 66-72 Sample ()	Link Here

int model_init (int argc, char *argv[], double *x1, double *y1, double *x2, double *y2)

int model_init (int argc, const char *argv[], double *x1, double *y1, double *x2, double *y2)

  DefaultValue::Bind ("RandomWalk2dMode", "Time");

  DefaultValue::Bind ("RandomWalk2dMode", "Time");

  DefaultValue::Bind ("RandomWalk2dTime", "5s");

  DefaultValue::Bind ("RandomWalk2dTime", "5s");




#define LOOKAHEAD_SECONDS 10

GtkWidget *g_canvas;

int model_init (int argc, char *argv[]);

struct Node
{

  goo_canvas_set_scale (GOO_CANVAS (g_canvas), gtk_adjustment_get_value (adj));
}

int main (int argc, const char *argv[])
{
  g_thread_init (NULL);
  gtk_init (&argc, (char***) &argv);
  double x1 = 0, y1 = 0, x2 = 0, y2 = 0;

  model_init (argc, argv, &x1, &y1, &x2, &y2);

(-)a/utils/mobility-visualizer.h (-1 / +1 lines)

Lines 1-7	Link Here

/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */

/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */

#include <vector>

#include <vector>

int model_init (int argc, char *argv[], double *x1, double *y1, double *x2, double *y2);

int model_init (int argc, const char *argv[], double *x1, double *y1, double *x2, double *y2);

struct NodeUpdate

struct NodeUpdate

Return to bug 121