fix constexpr definitions bug in class, test=develop (#4267)

02497657 · 石晓伟 · GitHub · 914219cc · 02497657
显示空白变更内容
内联并排

Showing with 24 addition and 16 deletion

lite/model_parser/base/traits.h lite/model_parser/base/traits.h +24 -16

未找到文件。
--- a/lite/model_parser/base/traits.h
+++ b/lite/model_parser/base/traits.h
@@ -124,17 +124,25 @@ struct OpDataTypeTrait;
  struct OpDataTypeTrait<type__, U> {                  \
    typedef type__ ET;                                 \
    typedef type__ RT;                                 \
-    static constexpr OpAttrType AT = OpAttrType::T; \
-    static constexpr const char* ATN = #T;          \
-  };
+    static constexpr OpAttrType AT{OpAttrType::T};     \
+    static constexpr const char* ATN{#T};              \
+  };                                                   \
+  template <typename U>                                \
+  constexpr OpAttrType OpDataTypeTrait<type__, U>::AT; \
+  template <typename U>                                \
+  constexpr const char* OpDataTypeTrait<type__, U>::ATN;
 #define ATTR_VECTOR_TYPE_TRAIT_IMPL(T, type__)                      \
  template <typename U>                                             \
  struct OpDataTypeTrait<std::vector<type__>, U> {                  \
    typedef type__ ET;                                              \
    typedef VectorView<type__, U> RT;                               \
-    static constexpr OpAttrType AT = OpAttrType::T; \
-    static constexpr const char* ATN = #T;          \
-  };
+    static constexpr OpAttrType AT{OpAttrType::T};                  \
+    static constexpr const char* ATN{#T};                           \
+  };                                                                \
+  template <typename U>                                             \
+  constexpr OpAttrType OpDataTypeTrait<std::vector<type__>, U>::AT; \
+  template <typename U>                                             \
+  constexpr const char* OpDataTypeTrait<std::vector<type__>, U>::ATN;

 ATTR_TYPE_TRAIT_IMPL(BLOCK, int16_t);
 ATTR_TYPE_TRAIT_IMPL(INT, int32_t);