Type id fix

Signed-off-by: Dmitry Chigarev <[email protected]>
apache · Oct 9, 2020 · c64085e · c64085e
1 parent 4b87148
commit c64085e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/cpp/src/arrow/type.cc b/cpp/src/arrow/type.cc
@@ -753,9 +753,12 @@ std::vector<std::shared_ptr<Field>> StructType::GetAllFieldsByName(
 template<uint32_t width>
 struct DecimalTypeHelper;
 
-#define DECIMAL_TYPE_HELPER_DECL(width) \
-template<> \
-struct DecimalTypeHelper<width> { using type = Decimal##width##Type; };
+#define DECIMAL_TYPE_HELPER_DECL(width)                  \
+template<>                                               \
+struct DecimalTypeHelper<width> {                        \
+  static constexpr Type::type id = Type::DECIMAL##width; \
+  using type = Decimal##width##Type;                     \
+};
 
 DECIMAL_TYPE_HELPER_DECL(128)
 DECIMAL_TYPE_HELPER_DECL(256)
@@ -765,7 +768,7 @@ DECIMAL_TYPE_HELPER_DECL(256)
 
 template<uint32_t width>
 BaseDecimalType<width>::BaseDecimalType(int32_t precision, int32_t scale)
-    : DecimalType(type_id, (width >> 3), precision, scale) {
+    : DecimalType(DecimalTypeHelper<width>::id, (width >> 3), precision, scale) {
   ARROW_CHECK_GE(precision, kMinPrecision);
   ARROW_CHECK_LE(precision, kMaxPrecision);
 }

diff --git a/cpp/src/arrow/type.h b/cpp/src/arrow/type.h
@@ -879,7 +879,7 @@ class ARROW_EXPORT DecimalType : public FixedSizeBinaryType {
 
 /// \brief Template type class for decimal data
 template<uint32_t width>
-class ARROW_EXPORT BaseDecimalType : public DecimalType {
+class BaseDecimalType : public DecimalType {
  public:
   static constexpr const char* type_name() { return DecimalMeta<width>::name; }