Optimize|Widgets|libcore: Use PointerSet for rule dependency tracking

Simpler data structure.
skyjake · Feb 12, 2017 · 6b96143 · 6b96143
1 parent 4d1600c
commit 6b96143
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/doomsday/sdk/libcore/src/widgets/rule.cpp b/doomsday/sdk/libcore/src/widgets/rule.cpp
@@ -19,15 +19,15 @@
 
 #include "de/Rule"
 #include "de/math.h"
-#include <unordered_set>
+#include "de/PointerSet"
 
 namespace de {
 
 bool Rule::_invalidRulesExist = false;
 
 DENG2_PIMPL_NOREF(Rule)
 {
-    typedef std::unordered_set<Rule const *> Dependencies;
+    typedef PointerSetT<Rule> Dependencies;
     Dependencies dependencies; // ref'd
 
     /// Current value of the rule.
@@ -44,7 +44,7 @@ DENG2_PIMPL_NOREF(Rule)
 
     ~Impl()
     {
-        DENG2_ASSERT(dependencies.empty());
+        DENG2_ASSERT(dependencies.isEmpty());
     }
 };
 
@@ -116,7 +116,7 @@ void Rule::setValue(float v)
 
 void Rule::dependsOn(Rule const &dependency)
 {
-    DENG2_ASSERT(d->dependencies.find(&dependency) == d->dependencies.end());
+    DENG2_ASSERT(!d->dependencies.contains(&dependency));
     d->dependencies.insert(de::holdRef(&dependency));
 
     dependency.audienceForRuleInvalidation += this;
@@ -131,8 +131,8 @@ void Rule::independentOf(Rule const &dependency)
 {
     dependency.audienceForRuleInvalidation -= this;
 
-    DENG2_ASSERT(d->dependencies.find(&dependency) != d->dependencies.end());
-    d->dependencies.erase(&dependency);
+    DENG2_ASSERT(d->dependencies.contains(&dependency));
+    d->dependencies.remove(&dependency);
     dependency.release();
 }