diff options
author | Daniel Wilhelm <shieldwed@outlook.com> | 2019-12-14 15:52:53 +0000 |
---|---|---|
committer | Daniel Wilhelm <shieldwed@outlook.com> | 2019-12-14 15:52:53 +0000 |
commit | cc75e50ca861529d50601d247fd66f806fcb23a8 (patch) | |
tree | e2c5c7b1f98e64011b1ee8ca4e9bb9157510dfe7 /zenXml/zenxml | |
parent | Merge branch '10.17' into 'master' (diff) | |
parent | add upstream 10.18 (diff) | |
download | FreeFileSync-cc75e50ca861529d50601d247fd66f806fcb23a8.tar.gz FreeFileSync-cc75e50ca861529d50601d247fd66f806fcb23a8.tar.bz2 FreeFileSync-cc75e50ca861529d50601d247fd66f806fcb23a8.zip |
Merge branch '10.18' into 'master'10.18
add upstream 10.18
See merge request opensource-tracking/FreeFileSync!15
Diffstat (limited to 'zenXml/zenxml')
-rw-r--r-- | zenXml/zenxml/cvrt_struc.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/zenXml/zenxml/cvrt_struc.h b/zenXml/zenxml/cvrt_struc.h index 85c5d8d0..9df1c7ba 100644 --- a/zenXml/zenxml/cvrt_struc.h +++ b/zenXml/zenxml/cvrt_struc.h @@ -46,9 +46,9 @@ template <class T> void writeStruc(const T& value, XmlElement& output); //------------------------------ implementation ------------------------------------- namespace impl_2384343 { -ZEN_INIT_DETECT_MEMBER_TYPE(value_type); -ZEN_INIT_DETECT_MEMBER_TYPE(iterator); -ZEN_INIT_DETECT_MEMBER_TYPE(const_iterator); +ZEN_INIT_DETECT_MEMBER_TYPE(value_type) +ZEN_INIT_DETECT_MEMBER_TYPE(iterator) +ZEN_INIT_DETECT_MEMBER_TYPE(const_iterator) ZEN_INIT_DETECT_MEMBER(begin) // ZEN_INIT_DETECT_MEMBER(end) //we don't know the exact declaration of the member attribute: may be in a base class! @@ -57,12 +57,12 @@ ZEN_INIT_DETECT_MEMBER(insert) // template <typename T> using IsStlContainer = std::bool_constant< - impl_2384343::HasMemberType_value_type <T>::value && - impl_2384343::HasMemberType_iterator <T>::value && - impl_2384343::HasMemberType_const_iterator<T>::value && - impl_2384343::HasMember_begin <T>::value && - impl_2384343::HasMember_end <T>::value && - impl_2384343::HasMember_insert <T>::value>; + impl_2384343::HasMemberTypeV_value_type <T> && + impl_2384343::HasMemberTypeV_iterator <T> && + impl_2384343::HasMemberTypeV_const_iterator<T> && + impl_2384343::HasMemberV_begin <T> && + impl_2384343::HasMemberV_end <T> && + impl_2384343::HasMemberV_insert <T>>; template <class T> |