use TypeClass::c_type

Author: emkornfield

cpp/src/arrow/types/primitive.h

@@ -53,10 +53,10 @@ class ARROW_EXPORT PrimitiveArray : public Array {
   const uint8_t* raw_data_;
 };
 
-template <class TypeClass, class T>
+template <class TypeClass>
 class ARROW_EXPORT NumericArray : public PrimitiveArray {
  public:
-  using value_type = T;
+  using value_type = typename TypeClass::c_type;
   NumericArray(int32_t length, const std::shared_ptr<Buffer>& data,
       int32_t null_count = 0, const std::shared_ptr<Buffer>& null_bitmap = nullptr)
       : PrimitiveArray(
@@ -65,7 +65,7 @@ class ARROW_EXPORT NumericArray : public PrimitiveArray {
       int32_t null_count = 0, const std::shared_ptr<Buffer>& null_bitmap = nullptr)
       : PrimitiveArray(type, length, data, null_count, null_bitmap) {}
 
-  bool EqualsExact(const NumericArray<TypeClass, T>& other) const {
+  bool EqualsExact(const NumericArray<TypeClass>& other) const {
     return PrimitiveArray::EqualsExact(*static_cast<const PrimitiveArray*>(&other));
   }
 
@@ -74,7 +74,7 @@ class ARROW_EXPORT NumericArray : public PrimitiveArray {
     if (this == arr.get()) { return true; }
     if (!arr) { return false; }
     if (this->type_enum() != arr->type_enum()) { return false; }
-    const auto other = static_cast<NumericArray<TypeClass, T>*>(arr.get());
+    const auto other = static_cast<NumericArray<TypeClass>*>(arr.get());
     for (int32_t i = start_idx, o_i = other_start_idx; i < end_idx; ++i, ++o_i) {
       const bool is_null = IsNull(i);
       if (is_null != arr->IsNull(o_i) || (!is_null && Value(i) != other->Value(o_i))) {
@@ -83,23 +83,23 @@ class ARROW_EXPORT NumericArray : public PrimitiveArray {
     }
     return true;
   }
-  const T* raw_data() const { return reinterpret_cast<const T*>(raw_data_); }
+  const value_type* raw_data() const { return reinterpret_cast<const value_type*>(raw_data_); }
 
-  T Value(int i) const { return raw_data()[i]; }
+  value_type Value(int i) const { return raw_data()[i]; }
 };
 
-#define NUMERIC_ARRAY_DECL(NAME, TypeClass, T) using NAME = NumericArray<TypeClass, T>;
-
-NUMERIC_ARRAY_DECL(UInt8Array, UInt8Type, uint8_t);
-NUMERIC_ARRAY_DECL(Int8Array, Int8Type, int8_t);
-NUMERIC_ARRAY_DECL(UInt16Array, UInt16Type, uint16_t);
-NUMERIC_ARRAY_DECL(Int16Array, Int16Type, int16_t);
-NUMERIC_ARRAY_DECL(UInt32Array, UInt32Type, uint32_t);
-NUMERIC_ARRAY_DECL(Int32Array, Int32Type, int32_t);
-NUMERIC_ARRAY_DECL(UInt64Array, UInt64Type, uint64_t);
-NUMERIC_ARRAY_DECL(Int64Array, Int64Type, int64_t);
-NUMERIC_ARRAY_DECL(FloatArray, FloatType, float);
-NUMERIC_ARRAY_DECL(DoubleArray, DoubleType, double);
+#define NUMERIC_ARRAY_DECL(NAME, TypeClass) using NAME = NumericArray<TypeClass>;
+
+NUMERIC_ARRAY_DECL(UInt8Array, UInt8Type);
+NUMERIC_ARRAY_DECL(Int8Array, Int8Type);
+NUMERIC_ARRAY_DECL(UInt16Array, UInt16Type);
+NUMERIC_ARRAY_DECL(Int16Array, Int16Type);
+NUMERIC_ARRAY_DECL(UInt32Array, UInt32Type);
+NUMERIC_ARRAY_DECL(Int32Array, Int32Type);
+NUMERIC_ARRAY_DECL(UInt64Array, UInt64Type);
+NUMERIC_ARRAY_DECL(Int64Array, Int64Type);
+NUMERIC_ARRAY_DECL(FloatArray, FloatType);
+NUMERIC_ARRAY_DECL(DoubleArray, DoubleType);
 
 template <typename Type>
 class ARROW_EXPORT PrimitiveBuilder : public ArrayBuilder {