diff options
| author | Andreas Stöckel <astoecke@techfak.uni-bielefeld.de> | 2014-12-05 17:53:51 +0100 |
|---|---|---|
| committer | Andreas Stöckel <andreas@somweyr.de> | 2014-12-05 17:53:51 +0100 |
| commit | c5daa927663cb0eafa56495bded0d80b21d94e4d (patch) | |
| tree | 9fd75d70b3d07d1e71aa6187ae20d266546f6fcc /src/core/CSS.hpp | |
| parent | 2069538e089696eead64169895c935ff4bc577ba (diff) | |
| parent | b7c2dd440523948bebca54a91a4ba06451b473f0 (diff) | |
Merge branch 'master' of somweyr.de:ousia
Diffstat (limited to 'src/core/CSS.hpp')
| -rw-r--r-- | src/core/CSS.hpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/core/CSS.hpp b/src/core/CSS.hpp index 4cf15be..aa701b5 100644 --- a/src/core/CSS.hpp +++ b/src/core/CSS.hpp @@ -85,10 +85,11 @@ public: return rules; } - void merge(Rooted<RuleSet> other) - { - rules.insert(other->rules.begin(), other->rules.end()); - } + /** + * This implements an overriding "insert all" of all rules in the other + * RuleSet to the rules in this RuleSet. + */ + void merge(Rooted<RuleSet> other); }; /** |