d-types.patch

   1 --- d-1.2.0/src/parse_opt_cfg.cpp.orig  2003-08-25 05:40:19.000000000 +0000
   2 +++ d-1.2.0/src/parse_opt_cfg.cpp       2003-12-01 07:20:26.000000000 +0000
   3 @@ -246,7 +246,7 @@
   4                 }
   5
   6                 string s;
   7 -               unsigned idx;
   8 +               string::size_type idx;
   9                 while (1) {
  10                         idx = arg.find(",", 0);
  11                         if (idx == arg.npos) {
  12 @@ -440,9 +440,9 @@
  13                 opt = "";
  14                 arg = "";
  15
  16 -               unsigned idx = src.find('=', 0);
  17 +               string::size_type idx = src.find('=', 0);
  18                 if (idx == src.npos) {
  19 -                       unsigned idx2 = src.find(' ', idx);
  20 +                       string::size_type idx2 = src.find(' ', idx);
  21                         if (idx2 != src.npos) {
  22                                 err << "  Spaces in the expression!";
  23                                 throw runtime_error(err.str());
  24 @@ -463,7 +463,7 @@
  25                         throw runtime_error(err.str());
  26                 }
  27
  28 -               unsigned idx2 = src.find('=', idx + 1);
  29 +               string::size_type idx2 = src.find('=', idx + 1);
  30                 if (idx2 != src.npos) {
  31                         err << "  More than one equals sign on the line!";
  32                         throw runtime_error(err.str());
  33 @@ -515,7 +515,7 @@
  34                                 arg.erase(0, 1);
  35                         }
  36
  37 -                       unsigned idx = arg.find(' ', 0);
  38 +                       string::size_type idx = arg.find(' ', 0);
  39                         if (idx != src.npos) {
  40                                 err << "  Spaces in the expression!";
  41                                 throw runtime_error(err.str());
  42 @@ -637,7 +637,7 @@
  43
  44                         src = ptr;
  45
  46 -                       unsigned idx = src.find('#', 0);
  47 +                       string::size_type idx = src.find('#', 0);
  48                         if (idx != src.npos)
  49                                 src.erase(idx);
  50
  51 --- d-1.2.0/src/path.cpp.orig   2003-08-30 13:42:32.000000000 +0000
  52 +++ d-1.2.0/src/path.cpp        2003-12-01 07:18:20.000000000 +0000
  53 @@ -82,8 +82,8 @@
  54  //-----------------------------------------------------------------------------
  55  void path::normalize_auxillary(const char* source_string)
  56  {
  57 -       unsigned idx1;
  58 -       unsigned idx2;
  59 +       string::size_type idx1;
  60 +       string::size_type idx2;
  61
  62         fdir = "";
  63         fname = "";