diff --git a/src/Add-ons/Addon.cxx b/src/Add-ons/Addon.cxx index 4d7f5eb7b..271a21e08 100644 --- a/src/Add-ons/Addon.cxx +++ b/src/Add-ons/Addon.cxx @@ -500,10 +500,10 @@ parseContactsNode_readNode(const SGPath& metadataFile, // Static method template (private and only used in this file) template <class T> -vector<typename ContactTraits<T>::strong_ref> +vector<typename contact_traits<T>::strong_ref> Addon::parseContactsNode(const SGPath& metadataFile, SGPropertyNode* mainNode) { - using contactTraits = ContactTraits<T>; + using contactTraits = contact_traits<T>; vector<typename contactTraits::strong_ref> res; if (mainNode != nullptr) { diff --git a/src/Add-ons/Addon.hxx b/src/Add-ons/Addon.hxx index 7fb09bdce..6bd455b61 100644 --- a/src/Add-ons/Addon.hxx +++ b/src/Add-ons/Addon.hxx @@ -182,7 +182,7 @@ private: // Return the corresponding vector<AuthorRef> or vector<MaintainerRef>. If // the 'mainNode' argument is nullptr, return an empty vector. template <class T> - static std::vector<typename ContactTraits<T>::strong_ref> + static std::vector<typename contact_traits<T>::strong_ref> parseContactsNode(const SGPath& metadataFile, SGPropertyNode* mainNode); // The add-on identifier, in reverse DNS style. The AddonManager refuses to diff --git a/src/Add-ons/contacts.hxx b/src/Add-ons/contacts.hxx index 6dacdfdda..5c00da6bf 100644 --- a/src/Add-ons/contacts.hxx +++ b/src/Add-ons/contacts.hxx @@ -89,14 +89,14 @@ public: }; // *************************************************************************** -// * ContactTraits * +// * contact_traits * // *************************************************************************** template <typename T> -struct ContactTraits; +struct contact_traits; template<> -struct ContactTraits<Author> +struct contact_traits<Author> { using contact_type = Author; using strong_ref = AuthorRef; @@ -108,7 +108,7 @@ struct ContactTraits<Author> }; template<> -struct ContactTraits<Maintainer> +struct contact_traits<Maintainer> { using contact_type = Maintainer; using strong_ref = MaintainerRef;