ns-allinone/gcc4.5.patch

   1 diff -ru ns-allinone-2.34.orig/ns-2.34/mobile/nakagami.cc ns-allinone-2.34.new/ns-2.34/mobile/nakagami.cc
   2 --- ns-allinone-2.34.orig/ns-2.34/mobile/nakagami.cc    2009-06-15 01:35:45.000000000 +0800
   3 +++ ns-allinone-2.34.new/ns-2.34/mobile/nakagami.cc     2010-09-01 15:51:51.000000000 +0800
   4 @@ -180,9 +180,9 @@
   5                 double resultPower;
   6
   7          if (int_m == m) {
   8 -                       resultPower = ErlangRandomVariable::ErlangRandomVariable(Pr/m, int_m).value();
   9 +                       resultPower = ::ErlangRandomVariable(Pr/m, int_m).value();
  10                 } else {
  11 -                       resultPower = GammaRandomVariable::GammaRandomVariable(m, Pr/m).value();
  12 +                       resultPower = ::GammaRandomVariable(m, Pr/m).value();
  13                 }
  14                 return resultPower;
  15         }
  16 diff -ru ns-allinone-2.34.orig/ns-2.34/tools/ranvar.cc ns-allinone-2.34.new/ns-2.34/tools/ranvar.cc
  17 --- ns-allinone-2.34.orig/ns-2.34/tools/ranvar.cc       2009-06-15 01:35:44.000000000 +0800
  18 +++ ns-allinone-2.34.new/ns-2.34/tools/ranvar.cc        2010-09-01 15:51:51.000000000 +0800
  19 @@ -216,7 +216,7 @@
  20         // ACM Transactions on mathematical software, Vol. 26, No. 3, Sept. 2000
  21         if (alpha_ < 1) {
  22                 double u = rng_->uniform(1.0);
  23 -               return GammaRandomVariable::GammaRandomVariable(1.0 + alpha_, beta_).value() * pow (u, 1.0 / alpha_);
  24 +               return ::GammaRandomVariable(1.0 + alpha_, beta_).value() * pow (u, 1.0 / alpha_);
  25         }
  26
  27         double x, v, u;
  28 diff -ru ns-allinone-2.34.orig/xgraph-12.1/dialog.c ns-allinone-2.34.new/xgraph-12.1/dialog.c
  29 --- ns-allinone-2.34.orig/xgraph-12.1/dialog.c  2009-06-15 01:35:06.000000000 +0800
  30 +++ ns-allinone-2.34.new/xgraph-12.1/dialog.c   2010-09-01 15:53:57.000000000 +0800
  31 @@ -777,7 +777,7 @@
  32      memset(new_info->lines, 0, sizeof(Window) * E_LINES);
  33
  34      lineptr = text;
  35 -    while (getline(&lineptr, line)) {
  36 +    while (xgraph_getline(&lineptr, line)) {
  37         if (new_info->num_lines >= new_info->alloc_lines) {
  38             int old_alloc_lines_size = new_info->alloc_lines * sizeof(Window);
  39             new_info->alloc_lines *= 2;
  40 @@ -884,11 +884,11 @@
  41      else
  42         fputs(err_text, stderr);
  43  }
  44 -\f
  45 +
  46
  47
  48  int
  49 -getline(tptr, lptr)
  50 +xgraph_getline(tptr, lptr)
  51  char  **tptr;
  52  char   *lptr;
  53
  54 @@ -914,7 +914,7 @@
  55         return 0;
  56      }
  57  }
  58 -\f
  59 +
  60
  61
  62  static void