ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/extra166y/AbstractParallelAnyArray.java
(Generate patch)

Comparing jsr166/src/extra166y/AbstractParallelAnyArray.java (file contents):
Revision 1.11 by jsr166, Sat Dec 29 23:55:19 2012 UTC vs.
Revision 1.12 by jsr166, Fri Jan 18 04:23:27 2013 UTC

# Line 403 | Line 403 | public abstract class AbstractParallelAn
403                              int otherOffset, BinaryLongOp combiner) {}
404  
405      // Base of object ref array classes
406 <    static abstract class OPap<T> extends AbstractParallelAnyArray {
406 >    abstract static class OPap<T> extends AbstractParallelAnyArray {
407          T[] array;
408          OPap(ForkJoinPool ex, int origin, int fence, T[] array) {
409              super(ex, origin, fence);
# Line 433 | Line 433 | public abstract class AbstractParallelAn
433      }
434  
435      // Base of double array classes
436 <    static abstract class DPap extends AbstractParallelAnyArray {
436 >    abstract static class DPap extends AbstractParallelAnyArray {
437          double[] array;
438          DPap(ForkJoinPool ex, int origin, int fence, double[] array) {
439              super(ex, origin, fence);
# Line 463 | Line 463 | public abstract class AbstractParallelAn
463      }
464  
465      // Base of long array classes
466 <    static abstract class LPap extends AbstractParallelAnyArray {
466 >    abstract static class LPap extends AbstractParallelAnyArray {
467          long[] array;
468          LPap(ForkJoinPool ex, int origin, int fence, long[] array) {
469              super(ex, origin, fence);
# Line 2228 | Line 2228 | public abstract class AbstractParallelAn
2228  
2229      // Object-mapped
2230  
2231 <    static abstract class OOMPap<T,U> extends ParallelArrayWithMapping<T,U> {
2231 >    abstract static class OOMPap<T,U> extends ParallelArrayWithMapping<T,U> {
2232          final Op<? super T, ? extends U> op;
2233          OOMPap(ForkJoinPool ex, int origin, int fence,
2234                 T[] array,
# Line 2258 | Line 2258 | public abstract class AbstractParallelAn
2258          }
2259      }
2260  
2261 <    static abstract class DOMPap<U> extends ParallelDoubleArrayWithMapping<U> {
2261 >    abstract static class DOMPap<U> extends ParallelDoubleArrayWithMapping<U> {
2262          final DoubleToObject<? extends U> op;
2263          DOMPap(ForkJoinPool ex, int origin, int fence,
2264                 double[] array, DoubleToObject<? extends U> op) {
# Line 2287 | Line 2287 | public abstract class AbstractParallelAn
2287          }
2288      }
2289  
2290 <    static abstract class LOMPap<U> extends ParallelLongArrayWithMapping<U> {
2290 >    abstract static class LOMPap<U> extends ParallelLongArrayWithMapping<U> {
2291          final LongToObject<? extends U> op;
2292          LOMPap(ForkJoinPool ex, int origin, int fence,
2293                 long[] array, LongToObject<? extends U> op) {
# Line 3013 | Line 3013 | public abstract class AbstractParallelAn
3013  
3014      // Object-combined
3015  
3016 <    static abstract class OOCPap<T,U> extends ParallelArrayWithMapping<T,U> {
3016 >    abstract static class OOCPap<T,U> extends ParallelArrayWithMapping<T,U> {
3017          final IntAndObjectToObject<? super T, ? extends U> op;
3018          OOCPap(ForkJoinPool ex, int origin, int fence,
3019                 T[] array,
# Line 3045 | Line 3045 | public abstract class AbstractParallelAn
3045          }
3046      }
3047  
3048 <    static abstract class DOCPap<U> extends ParallelDoubleArrayWithMapping<U> {
3048 >    abstract static class DOCPap<U> extends ParallelDoubleArrayWithMapping<U> {
3049          final IntAndDoubleToObject<? extends U> op;
3050          DOCPap(ForkJoinPool ex, int origin, int fence,
3051                 double[] array, IntAndDoubleToObject<? extends U> op) {
# Line 3076 | Line 3076 | public abstract class AbstractParallelAn
3076          }
3077      }
3078  
3079 <    static abstract class LOCPap<U> extends ParallelLongArrayWithMapping<U> {
3079 >    abstract static class LOCPap<U> extends ParallelLongArrayWithMapping<U> {
3080          final IntAndLongToObject<? extends U> op;
3081          LOCPap(ForkJoinPool ex, int origin, int fence,
3082                 long[] array, IntAndLongToObject<? extends U> op) {
# Line 3784 | Line 3784 | public abstract class AbstractParallelAn
3784  
3785      // Double-mapped
3786  
3787 <    static abstract class ODMPap<T> extends ParallelArrayWithDoubleMapping<T> {
3787 >    abstract static class ODMPap<T> extends ParallelArrayWithDoubleMapping<T> {
3788          final ObjectToDouble<? super T> op;
3789          ODMPap(ForkJoinPool ex, int origin, int fence,
3790                 T[] array, ObjectToDouble<? super T> op) {
# Line 3814 | Line 3814 | public abstract class AbstractParallelAn
3814  
3815      }
3816  
3817 <    static abstract class DDMPap extends ParallelDoubleArrayWithDoubleMapping {
3817 >    abstract static class DDMPap extends ParallelDoubleArrayWithDoubleMapping {
3818          final DoubleOp op;
3819          DDMPap
3820              (ForkJoinPool ex, int origin, int fence,
# Line 3844 | Line 3844 | public abstract class AbstractParallelAn
3844          }
3845      }
3846  
3847 <    static abstract class LDMPap extends ParallelLongArrayWithDoubleMapping {
3847 >    abstract static class LDMPap extends ParallelLongArrayWithDoubleMapping {
3848          final LongToDouble op;
3849          LDMPap(ForkJoinPool ex, int origin, int fence,
3850                 long[] array, LongToDouble op) {
# Line 4530 | Line 4530 | public abstract class AbstractParallelAn
4530      }
4531  
4532      // double-combined
4533 <    static abstract class ODCPap<T> extends ParallelArrayWithDoubleMapping<T> {
4533 >    abstract static class ODCPap<T> extends ParallelArrayWithDoubleMapping<T> {
4534          final IntAndObjectToDouble<? super T> op;
4535          ODCPap(ForkJoinPool ex, int origin, int fence,
4536                 T[] array, IntAndObjectToDouble<? super T> op) {
# Line 4562 | Line 4562 | public abstract class AbstractParallelAn
4562  
4563      }
4564  
4565 <    static abstract class DDCPap extends ParallelDoubleArrayWithDoubleMapping {
4565 >    abstract static class DDCPap extends ParallelDoubleArrayWithDoubleMapping {
4566          final IntAndDoubleToDouble op;
4567          DDCPap(ForkJoinPool ex, int origin, int fence,
4568                 double[] array, IntAndDoubleToDouble op) {
# Line 4593 | Line 4593 | public abstract class AbstractParallelAn
4593          }
4594      }
4595  
4596 <    static abstract class LDCPap extends ParallelLongArrayWithDoubleMapping {
4596 >    abstract static class LDCPap extends ParallelLongArrayWithDoubleMapping {
4597          final IntAndLongToDouble op;
4598          LDCPap(ForkJoinPool ex, int origin, int fence,
4599                 long[] array, IntAndLongToDouble op) {
# Line 5281 | Line 5281 | public abstract class AbstractParallelAn
5281      }
5282  
5283      // long-combined
5284 <    static abstract class OLMPap<T> extends ParallelArrayWithLongMapping<T> {
5284 >    abstract static class OLMPap<T> extends ParallelArrayWithLongMapping<T> {
5285          final ObjectToLong<? super T> op;
5286          OLMPap(ForkJoinPool ex, int origin, int fence,
5287                 T[] array, final ObjectToLong<? super T> op) {
# Line 5310 | Line 5310 | public abstract class AbstractParallelAn
5310          }
5311      }
5312  
5313 <    static abstract class DLMPap extends ParallelDoubleArrayWithLongMapping {
5313 >    abstract static class DLMPap extends ParallelDoubleArrayWithLongMapping {
5314          final DoubleToLong op;
5315          DLMPap(ForkJoinPool ex, int origin, int fence,
5316                 double[] array, DoubleToLong op) {
# Line 5340 | Line 5340 | public abstract class AbstractParallelAn
5340  
5341      }
5342  
5343 <    static abstract class LLMPap extends ParallelLongArrayWithLongMapping {
5343 >    abstract static class LLMPap extends ParallelLongArrayWithLongMapping {
5344          final LongOp op;
5345          LLMPap(ForkJoinPool ex, int origin, int fence,
5346                 long[] array, LongOp op) {
# Line 6032 | Line 6032 | public abstract class AbstractParallelAn
6032      }
6033  
6034      // long-combined
6035 <    static abstract class OLCPap<T> extends ParallelArrayWithLongMapping<T> {
6035 >    abstract static class OLCPap<T> extends ParallelArrayWithLongMapping<T> {
6036          final IntAndObjectToLong<? super T> op;
6037          OLCPap(ForkJoinPool ex, int origin, int fence,
6038                 T[] array, IntAndObjectToLong<? super T> op) {
# Line 6063 | Line 6063 | public abstract class AbstractParallelAn
6063          }
6064      }
6065  
6066 <    static abstract class DLCPap extends ParallelDoubleArrayWithLongMapping {
6066 >    abstract static class DLCPap extends ParallelDoubleArrayWithLongMapping {
6067          final IntAndDoubleToLong op;
6068          DLCPap(ForkJoinPool ex, int origin, int fence,
6069                 double[] array, IntAndDoubleToLong op) {
# Line 6094 | Line 6094 | public abstract class AbstractParallelAn
6094          }
6095      }
6096  
6097 <    static abstract class LLCPap extends ParallelLongArrayWithLongMapping {
6097 >    abstract static class LLCPap extends ParallelLongArrayWithLongMapping {
6098          final IntAndLongToLong op;
6099          LLCPap(ForkJoinPool ex, int origin, int fence,
6100                 long[] array, IntAndLongToLong op) {

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines