Changeset 116

Show
Ignore:
Timestamp:
11/28/11 08:59:06 (6 months ago)
Author:
schveiguy
Message:

Fixed 64-bit issues with uint and ArrayList? keys.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • branches/d2/examples/iterators.d

    r102 r116  
    3232        x.add(i + 1); 
    3333 
    34     printk!(uint, int)(x, "original list"); 
     34    printk!(size_t, int)(x, "original list"); 
    3535 
    3636    // 
     
    6767    // to normal iterators 
    6868    // 
    69     print!(long)(new TransformKeyedIterator!(int, long, uint, int)(x, function void(ref uint idx, ref int v, ref int ignored, ref long result){ result = 0x1_0000_0000L * idx + v;}), "indexes and values combined"); 
     69    print!(long)(new TransformKeyedIterator!(int, long, size_t, int)(x, function void(ref size_t idx, ref int v, ref int ignored, ref long result){ result = 0x1_0000_0000L * idx + v;}), "indexes and values combined"); 
    7070 
    7171    // 
    7272    // chained keyed iterator 
    7373    // 
    74     printk!(uint, int)(new ChainKeyedIterator!(uint, int)(x, x, x),  "prints elements 3 times (keyed)"); 
     74    printk!(size_t, int)(new ChainKeyedIterator!(size_t, int)(x, x, x),  "prints elements 3 times (keyed)"); 
    7575 
    7676    // 
    7777    // keyed filter iterators 
    7878    // 
    79     printk!(uint, int)(new FilterKeyedIterator!(uint, int)(x, function bool(ref uint idx, ref int v){return idx % 2 == 0;}),  "prints values at even indexes"); 
     79    printk!(size_t, int)(new FilterKeyedIterator!(size_t, int)(x, function bool(ref size_t idx, ref int v){return idx % 2 == 0;}),  "prints values at even indexes"); 
    8080 
    8181    // 
    8282    // add all elements to an AA 
    8383    // 
    84     writefln("converted to an AA: %s", toAA!(uint, int)(x)); 
     84    writefln("converted to an AA: %s", toAA!(size_t, int)(x)); 
    8585}