diff options
| author | Andreas Stöckel <astoecke@techfak.uni-bielefeld.de> | 2015-01-03 16:44:15 +0100 |
|---|---|---|
| committer | Andreas Stöckel <andreas@somweyr.de> | 2015-01-03 16:44:15 +0100 |
| commit | 5c8c0cc70b49c5fb2d85778c31c3d3f9a670d315 (patch) | |
| tree | c659c883819b556910eabcbf10faf89fc769bc89 /src/core/common | |
| parent | 603dedfa2b3704730fa4db8e7f84702b26da9ae6 (diff) | |
Renamed "contains" to aggregatedOf, added corresponding convenience function to Rtti class
Diffstat (limited to 'src/core/common')
| -rw-r--r-- | src/core/common/Rtti.cpp | 7 | ||||
| -rw-r--r-- | src/core/common/Rtti.hpp | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/core/common/Rtti.cpp b/src/core/common/Rtti.cpp index 5de2b4c..edfcda8 100644 --- a/src/core/common/Rtti.cpp +++ b/src/core/common/Rtti.cpp @@ -54,7 +54,7 @@ void RttiBase::initialize() const initialized = true; // Insert the parent types of the parent types and the aggregated types - // if the parents + // of the parents { std::unordered_set<const RttiBase *> origParents = parents; for (const RttiBase *parent : origParents) { @@ -69,7 +69,8 @@ void RttiBase::initialize() const parents.insert(this); } - // Insert the aggregated types of the aggregated types + // Insert the aggregated types of the aggregated types and the parents + // of each aggregated type { std::unordered_set<const RttiBase *> origAggregatedTypes = aggregatedTypes; @@ -90,7 +91,7 @@ bool RttiBase::isa(const RttiBase &other) const return parents.count(&other) > 0; } -bool RttiBase::contains(const RttiBase &other) const +bool RttiBase::aggregatedOf(const RttiBase &other) const { initialize(); return aggregatedTypes.count(&other) > 0; diff --git a/src/core/common/Rtti.hpp b/src/core/common/Rtti.hpp index 090b65b..deaf128 100644 --- a/src/core/common/Rtti.hpp +++ b/src/core/common/Rtti.hpp @@ -189,7 +189,7 @@ public: * @param other is the other type for which should be checked whether this * type is directly or indirectly aggregated of it. */ - bool contains(const RttiBase &other) const; + bool aggregatedOf(const RttiBase &other) const; }; /** |