remove constexpr from type construction

This commit is contained in:
Ilya Churaev 2021-11-10 10:46:17 +03:00
parent fbad8b282b
commit 6c22d7ecfa
2 changed files with 7 additions and 8 deletions

View File

@ -14,7 +14,6 @@
#define _OPENVINO_RTTI_WITH_TYPE_VERSION(TYPE_NAME, VERSION_NAME) \ #define _OPENVINO_RTTI_WITH_TYPE_VERSION(TYPE_NAME, VERSION_NAME) \
static const ::ov::DiscreteTypeInfo& get_type_info_static() { \ static const ::ov::DiscreteTypeInfo& get_type_info_static() { \
static ::ov::DiscreteTypeInfo type_info{TYPE_NAME, 0, VERSION_NAME}; \ static ::ov::DiscreteTypeInfo type_info{TYPE_NAME, 0, VERSION_NAME}; \
type_info.hash(); \
return type_info; \ return type_info; \
} \ } \
const ::ov::DiscreteTypeInfo& get_type_info() const override { \ const ::ov::DiscreteTypeInfo& get_type_info() const override { \
@ -30,7 +29,6 @@
OLD_VERSION, \ OLD_VERSION, \
VERSION_NAME, \ VERSION_NAME, \
&PARENT_CLASS::get_type_info_static()}; \ &PARENT_CLASS::get_type_info_static()}; \
type_info.hash(); \
return type_info; \ return type_info; \
} \ } \
const ::ov::DiscreteTypeInfo& get_type_info() const override { \ const ::ov::DiscreteTypeInfo& get_type_info() const override { \

View File

@ -42,15 +42,16 @@ struct OPENVINO_API DiscreteTypeInfo {
parent(_parent), parent(_parent),
hash_value(0) {} hash_value(0) {}
constexpr DiscreteTypeInfo(const char* _name, DiscreteTypeInfo(const char* _name,
uint64_t _version, uint64_t _version,
const char* _version_id, const char* _version_id,
const DiscreteTypeInfo* _parent = nullptr) const DiscreteTypeInfo* _parent = nullptr)
: name(_name), : name(_name),
version(_version), version(_version),
version_id(_version_id), version_id(_version_id),
parent(_parent), parent(_parent) {
hash_value(0) {} hash_value = hash();
}
bool is_castable(const DiscreteTypeInfo& target_type) const; bool is_castable(const DiscreteTypeInfo& target_type) const;