Skip to content

Commit

Permalink
* Rebase PrimitiveScalar on PrimitiveScalarBase in presets for A…
Browse files Browse the repository at this point in the history
…rrow for easy access to `data()` (issue #998)
  • Loading branch information
saudet committed Jan 20, 2021
1 parent 0e9486a commit 747a920
Show file tree
Hide file tree
Showing 343 changed files with 359 additions and 358 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@

* Rebase `PrimitiveScalar` on `PrimitiveScalarBase` in presets for Arrow for easy access to `data()` ([issue #998](https://github.com/bytedeco/javacpp-presets/issues/998))
* Add `NamedMetadataOperations.h` implementing data retrieval operations for LLVM nodes ([pull #995](https://github.com/bytedeco/javacpp-presets/pull/995))
* Enable OpenMP for ONNX Runtime on Mac once again ([issue #917](https://github.com/bytedeco/javacpp-presets/issues/917))
* Build OpenCV without OpenBLAS when environment variable `NOOPENBLAS=yes` ([pull #987](https://github.com/bytedeco/javacpp-presets/pull/987))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public class ArithmeticOptions extends FunctionOptions {
return (ArithmeticOptions)super.position(position);
}
@Override public ArithmeticOptions getPointer(long i) {
return new ArithmeticOptions(this).position(position + i);
return new ArithmeticOptions((Pointer)this).position(position + i);
}

public ArithmeticOptions() { super((Pointer)null); allocate(); }
Expand Down
2 changes: 1 addition & 1 deletion arrow/src/gen/java/org/bytedeco/arrow/Arity.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public class Arity extends Pointer {
return (Arity)super.position(position);
}
@Override public Arity getPointer(long i) {
return new Arity(this).position(position + i);
return new Arity((Pointer)this).position(position + i);
}

/** \brief A function taking no arguments */
Expand Down
2 changes: 1 addition & 1 deletion arrow/src/gen/java/org/bytedeco/arrow/ArrayData.java
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public class ArrayData extends Pointer {
return (ArrayData)super.position(position);
}
@Override public ArrayData getPointer(long i) {
return new ArrayData(this).position(position + i);
return new ArrayData((Pointer)this).position(position + i);
}

public ArrayData() { super((Pointer)null); allocate(); }
Expand Down
2 changes: 1 addition & 1 deletion arrow/src/gen/java/org/bytedeco/arrow/ArrayDataResult.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public class ArrayDataResult extends Pointer {
return (ArrayDataResult)super.position(position);
}
@Override public ArrayDataResult getPointer(long i) {
return new ArrayDataResult(this).position(position + i);
return new ArrayDataResult((Pointer)this).position(position + i);
}


Expand Down
2 changes: 1 addition & 1 deletion arrow/src/gen/java/org/bytedeco/arrow/ArrayKernel.java
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public class ArrayKernel extends Kernel {
return (ArrayKernel)super.position(position);
}
@Override public ArrayKernel getPointer(long i) {
return new ArrayKernel(this).position(position + i);
return new ArrayKernel((Pointer)this).position(position + i);
}

public ArrayKernel() { super((Pointer)null); allocate(); }
Expand Down
2 changes: 1 addition & 1 deletion arrow/src/gen/java/org/bytedeco/arrow/ArrayResult.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public class ArrayResult extends Pointer {
return (ArrayResult)super.position(position);
}
@Override public ArrayResult getPointer(long i) {
return new ArrayResult(this).position(position + i);
return new ArrayResult((Pointer)this).position(position + i);
}


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public class ArrayVectorResult extends Pointer {
return (ArrayVectorResult)super.position(position);
}
@Override public ArrayVectorResult getPointer(long i) {
return new ArrayVectorResult(this).position(position + i);
return new ArrayVectorResult((Pointer)this).position(position + i);
}


Expand Down
2 changes: 1 addition & 1 deletion arrow/src/gen/java/org/bytedeco/arrow/ArrayVisitor.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public class ArrayVisitor extends Pointer {
return (ArrayVisitor)super.position(position);
}
@Override public ArrayVisitor getPointer(long i) {
return new ArrayVisitor(this).position(position + i);
return new ArrayVisitor((Pointer)this).position(position + i);
}


Expand Down
2 changes: 1 addition & 1 deletion arrow/src/gen/java/org/bytedeco/arrow/AsyncContext.java
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public class AsyncContext extends Pointer {
return (AsyncContext)super.position(position);
}
@Override public AsyncContext getPointer(long i) {
return new AsyncContext(this).position(position + i);
return new AsyncContext((Pointer)this).position(position + i);
}

public native Executor executor(); public native AsyncContext executor(Executor setter);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@


@Name("arrow::TemporalScalar<arrow::Date32Type>") @Properties(inherit = org.bytedeco.arrow.presets.arrow.class)
public class BaseBaseDate32Scalar extends Scalar {
public class BaseBaseDate32Scalar extends PrimitiveScalarBase {
static { Loader.load(); }
/** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */
public BaseBaseDate32Scalar(Pointer p) { super(p); }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@


@Name("arrow::TemporalScalar<arrow::Date64Type>") @Properties(inherit = org.bytedeco.arrow.presets.arrow.class)
public class BaseBaseDate64Scalar extends Scalar {
public class BaseBaseDate64Scalar extends PrimitiveScalarBase {
static { Loader.load(); }
/** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */
public BaseBaseDate64Scalar(Pointer p) { super(p); }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@


@Name("arrow::TemporalScalar<arrow::DayTimeIntervalType>") @Properties(inherit = org.bytedeco.arrow.presets.arrow.class)
public class BaseBaseDayTimeIntervalScalar extends Scalar {
public class BaseBaseDayTimeIntervalScalar extends PrimitiveScalarBase {
static { Loader.load(); }
/** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */
public BaseBaseDayTimeIntervalScalar(Pointer p) { super(p); }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@


@Name("arrow::TemporalScalar<arrow::MonthIntervalType>") @Properties(inherit = org.bytedeco.arrow.presets.arrow.class)
public class BaseBaseMonthIntervalType extends Scalar {
public class BaseBaseMonthIntervalType extends PrimitiveScalarBase {
static { Loader.load(); }
/** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */
public BaseBaseMonthIntervalType(Pointer p) { super(p); }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@


@Name("arrow::TemporalScalar<arrow::Time32Type>") @Properties(inherit = org.bytedeco.arrow.presets.arrow.class)
public class BaseBaseTime32Scalar extends Scalar {
public class BaseBaseTime32Scalar extends PrimitiveScalarBase {
static { Loader.load(); }
/** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */
public BaseBaseTime32Scalar(Pointer p) { super(p); }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@


@Name("arrow::TemporalScalar<arrow::Time64Type>") @Properties(inherit = org.bytedeco.arrow.presets.arrow.class)
public class BaseBaseTime64Scalar extends Scalar {
public class BaseBaseTime64Scalar extends PrimitiveScalarBase {
static { Loader.load(); }
/** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */
public BaseBaseTime64Scalar(Pointer p) { super(p); }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public class BaseDayTimeIntervalScalar extends BaseBaseDayTimeIntervalScalar {
return (BaseDayTimeIntervalScalar)super.position(position);
}
@Override public BaseDayTimeIntervalScalar getPointer(long i) {
return new BaseDayTimeIntervalScalar(this).position(position + i);
return new BaseDayTimeIntervalScalar((Pointer)this).position(position + i);
}


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@


@Name("arrow::NumericScalar<arrow::DoubleType>") @Properties(inherit = org.bytedeco.arrow.presets.arrow.class)
public class BaseDoubleScalar extends Scalar {
public class BaseDoubleScalar extends PrimitiveScalarBase {
static { Loader.load(); }
/** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */
public BaseDoubleScalar(Pointer p) { super(p); }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@


@Name("arrow::TemporalScalar<arrow::DurationType>") @Properties(inherit = org.bytedeco.arrow.presets.arrow.class)
public class BaseDurationScalar extends Scalar {
public class BaseDurationScalar extends PrimitiveScalarBase {
static { Loader.load(); }
/** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */
public BaseDurationScalar(Pointer p) { super(p); }
Expand Down
2 changes: 1 addition & 1 deletion arrow/src/gen/java/org/bytedeco/arrow/BaseFloatScalar.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@


@Name("arrow::NumericScalar<arrow::FloatType>") @Properties(inherit = org.bytedeco.arrow.presets.arrow.class)
public class BaseFloatScalar extends Scalar {
public class BaseFloatScalar extends PrimitiveScalarBase {
static { Loader.load(); }
/** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */
public BaseFloatScalar(Pointer p) { super(p); }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@


@Name("arrow::NumericScalar<arrow::HalfFloatType>") @Properties(inherit = org.bytedeco.arrow.presets.arrow.class)
public class BaseHalfFloatScalar extends Scalar {
public class BaseHalfFloatScalar extends PrimitiveScalarBase {
static { Loader.load(); }
/** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */
public BaseHalfFloatScalar(Pointer p) { super(p); }
Expand All @@ -23,7 +23,7 @@ public class BaseHalfFloatScalar extends Scalar {
return (BaseHalfFloatScalar)super.position(position);
}
@Override public BaseHalfFloatScalar getPointer(long i) {
return new BaseHalfFloatScalar(this).position(position + i);
return new BaseHalfFloatScalar((Pointer)this).position(position + i);
}


Expand Down
4 changes: 2 additions & 2 deletions arrow/src/gen/java/org/bytedeco/arrow/BaseInt16Type.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@


@Name("arrow::NumericScalar<arrow::Int16Type>") @Properties(inherit = org.bytedeco.arrow.presets.arrow.class)
public class BaseInt16Type extends Scalar {
public class BaseInt16Type extends PrimitiveScalarBase {
static { Loader.load(); }
/** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */
public BaseInt16Type(Pointer p) { super(p); }
Expand All @@ -23,7 +23,7 @@ public class BaseInt16Type extends Scalar {
return (BaseInt16Type)super.position(position);
}
@Override public BaseInt16Type getPointer(long i) {
return new BaseInt16Type(this).position(position + i);
return new BaseInt16Type((Pointer)this).position(position + i);
}


Expand Down
2 changes: 1 addition & 1 deletion arrow/src/gen/java/org/bytedeco/arrow/BaseInt32Type.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@


@Name("arrow::NumericScalar<arrow::Int32Type>") @Properties(inherit = org.bytedeco.arrow.presets.arrow.class)
public class BaseInt32Type extends Scalar {
public class BaseInt32Type extends PrimitiveScalarBase {
static { Loader.load(); }
/** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */
public BaseInt32Type(Pointer p) { super(p); }
Expand Down
2 changes: 1 addition & 1 deletion arrow/src/gen/java/org/bytedeco/arrow/BaseInt64Type.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@


@Name("arrow::NumericScalar<arrow::Int64Type>") @Properties(inherit = org.bytedeco.arrow.presets.arrow.class)
public class BaseInt64Type extends Scalar {
public class BaseInt64Type extends PrimitiveScalarBase {
static { Loader.load(); }
/** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */
public BaseInt64Type(Pointer p) { super(p); }
Expand Down
4 changes: 2 additions & 2 deletions arrow/src/gen/java/org/bytedeco/arrow/BaseInt8Type.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@


@Name("arrow::NumericScalar<arrow::Int8Type>") @Properties(inherit = org.bytedeco.arrow.presets.arrow.class)
public class BaseInt8Type extends Scalar {
public class BaseInt8Type extends PrimitiveScalarBase {
static { Loader.load(); }
/** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */
public BaseInt8Type(Pointer p) { super(p); }
Expand All @@ -23,7 +23,7 @@ public class BaseInt8Type extends Scalar {
return (BaseInt8Type)super.position(position);
}
@Override public BaseInt8Type getPointer(long i) {
return new BaseInt8Type(this).position(position + i);
return new BaseInt8Type((Pointer)this).position(position + i);
}


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public class BaseLargeListArray extends Array {
return (BaseLargeListArray)super.position(position);
}
@Override public BaseLargeListArray getPointer(long i) {
return new BaseLargeListArray(this).position(position + i);
return new BaseLargeListArray((Pointer)this).position(position + i);
}


Expand Down
2 changes: 1 addition & 1 deletion arrow/src/gen/java/org/bytedeco/arrow/BaseListArray.java
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public class BaseListArray extends Array {
return (BaseListArray)super.position(position);
}
@Override public BaseListArray getPointer(long i) {
return new BaseListArray(this).position(position + i);
return new BaseListArray((Pointer)this).position(position + i);
}


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@


@Name("arrow::TemporalScalar<arrow::TimestampType>") @Properties(inherit = org.bytedeco.arrow.presets.arrow.class)
public class BaseTimestampScalar extends Scalar {
public class BaseTimestampScalar extends PrimitiveScalarBase {
static { Loader.load(); }
/** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */
public BaseTimestampScalar(Pointer p) { super(p); }
Expand Down
4 changes: 2 additions & 2 deletions arrow/src/gen/java/org/bytedeco/arrow/BaseUInt16Type.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@


@Name("arrow::NumericScalar<arrow::UInt16Type>") @Properties(inherit = org.bytedeco.arrow.presets.arrow.class)
public class BaseUInt16Type extends Scalar {
public class BaseUInt16Type extends PrimitiveScalarBase {
static { Loader.load(); }
/** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */
public BaseUInt16Type(Pointer p) { super(p); }
Expand All @@ -23,7 +23,7 @@ public class BaseUInt16Type extends Scalar {
return (BaseUInt16Type)super.position(position);
}
@Override public BaseUInt16Type getPointer(long i) {
return new BaseUInt16Type(this).position(position + i);
return new BaseUInt16Type((Pointer)this).position(position + i);
}


Expand Down
2 changes: 1 addition & 1 deletion arrow/src/gen/java/org/bytedeco/arrow/BaseUInt32Type.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@


@Name("arrow::NumericScalar<arrow::UInt32Type>") @Properties(inherit = org.bytedeco.arrow.presets.arrow.class)
public class BaseUInt32Type extends Scalar {
public class BaseUInt32Type extends PrimitiveScalarBase {
static { Loader.load(); }
/** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */
public BaseUInt32Type(Pointer p) { super(p); }
Expand Down
2 changes: 1 addition & 1 deletion arrow/src/gen/java/org/bytedeco/arrow/BaseUInt64Type.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@


@Name("arrow::NumericScalar<arrow::UInt64Type>") @Properties(inherit = org.bytedeco.arrow.presets.arrow.class)
public class BaseUInt64Type extends Scalar {
public class BaseUInt64Type extends PrimitiveScalarBase {
static { Loader.load(); }
/** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */
public BaseUInt64Type(Pointer p) { super(p); }
Expand Down
4 changes: 2 additions & 2 deletions arrow/src/gen/java/org/bytedeco/arrow/BaseUInt8Type.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@


@Name("arrow::NumericScalar<arrow::UInt8Type>") @Properties(inherit = org.bytedeco.arrow.presets.arrow.class)
public class BaseUInt8Type extends Scalar {
public class BaseUInt8Type extends PrimitiveScalarBase {
static { Loader.load(); }
/** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */
public BaseUInt8Type(Pointer p) { super(p); }
Expand All @@ -23,7 +23,7 @@ public class BaseUInt8Type extends Scalar {
return (BaseUInt8Type)super.position(position);
}
@Override public BaseUInt8Type getPointer(long i) {
return new BaseUInt8Type(this).position(position + i);
return new BaseUInt8Type((Pointer)this).position(position + i);
}


Expand Down
2 changes: 1 addition & 1 deletion arrow/src/gen/java/org/bytedeco/arrow/BasicDecimal128.java
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public class BasicDecimal128 extends Pointer {
return (BasicDecimal128)super.position(position);
}
@Override public BasicDecimal128 getPointer(long i) {
return new BasicDecimal128(this).position(position + i);
return new BasicDecimal128((Pointer)this).position(position + i);
}

/** \brief Create a BasicDecimal128 from the two's complement representation. */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public class BinaryArrayResult extends Pointer {
return (BinaryArrayResult)super.position(position);
}
@Override public BinaryArrayResult getPointer(long i) {
return new BinaryArrayResult(this).position(position + i);
return new BinaryArrayResult((Pointer)this).position(position + i);
}


Expand Down
2 changes: 1 addition & 1 deletion arrow/src/gen/java/org/bytedeco/arrow/BinaryBuilder.java
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public class BinaryBuilder extends BaseBinaryBuilder {
return (BinaryBuilder)super.position(position);
}
@Override public BinaryBuilder getPointer(long i) {
return new BinaryBuilder(this).position(position + i);
return new BinaryBuilder((Pointer)this).position(position + i);
}


Expand Down
2 changes: 1 addition & 1 deletion arrow/src/gen/java/org/bytedeco/arrow/BinaryScalar.java
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public class BinaryScalar extends BaseBinaryScalar {
return (BinaryScalar)super.position(position);
}
@Override public BinaryScalar getPointer(long i) {
return new BinaryScalar(this).position(position + i);
return new BinaryScalar((Pointer)this).position(position + i);
}


Expand Down
2 changes: 1 addition & 1 deletion arrow/src/gen/java/org/bytedeco/arrow/BinaryType.java
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public class BinaryType extends BaseBinaryType {
return (BinaryType)super.position(position);
}
@Override public BinaryType getPointer(long i) {
return new BinaryType(this).position(position + i);
return new BinaryType((Pointer)this).position(position + i);
}

@MemberGetter public static native @Cast("const arrow::Type::type") int type_id();
Expand Down
2 changes: 1 addition & 1 deletion arrow/src/gen/java/org/bytedeco/arrow/BoolResult.java
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public class BoolResult extends Pointer {
return (BoolResult)super.position(position);
}
@Override public BoolResult getPointer(long i) {
return new BoolResult(this).position(position + i);
return new BoolResult((Pointer)this).position(position + i);
}


Expand Down
2 changes: 1 addition & 1 deletion arrow/src/gen/java/org/bytedeco/arrow/BooleanBuilder.java
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public class BooleanBuilder extends ArrayBuilder {
return (BooleanBuilder)super.position(position);
}
@Override public BooleanBuilder getPointer(long i) {
return new BooleanBuilder(this).position(position + i);
return new BooleanBuilder((Pointer)this).position(position + i);
}


Expand Down
Loading

0 comments on commit 747a920

Please sign in to comment.