Scarfski/entt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

poly: renaming to avoid conflicts with libraries that redefine words randomly (close #615)

Browse Source
This commit is contained in:
Michele Caini
2020-12-26 17:00:51 +01:00
parent 29c1766714
commit 4b89fc390d
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/entt/poly/poly.hpp
View File

@@ -178,8 +178,8 @@ class poly: private Concept::template type<poly_base<poly<Concept>>> {
using vtable_type = typename poly_vtable<Concept>::type;
public:
/*! @brief Concept interface type. */
using interface = typename Concept::template type<poly_base<poly<Concept>>>;
/*! @brief Concept type. */
using concept_type = typename Concept::template type<poly_base<poly<Concept>>>;
/*! @brief Default constructor. */
poly() ENTT_NOEXCEPT
@@ -290,12 +290,12 @@ public:
* @brief Returns a pointer to the underlying concept.
* @return A pointer to the underlying concept.
*/
[[nodiscard]] interface * operator->() ENTT_NOEXCEPT {
[[nodiscard]] concept_type * operator->() ENTT_NOEXCEPT {
return this;
}
/*! @copydoc operator-> */
[[nodiscard]] const interface * operator->() const ENTT_NOEXCEPT {
[[nodiscard]] const concept_type * operator->() const ENTT_NOEXCEPT {
return this;
}