diff options
| author | Benjamin Paassen <bpaassen@techfak.uni-bielefeld.de> | 2014-12-05 17:09:34 +0100 |
|---|---|---|
| committer | Benjamin Paassen <bpaassen@techfak.uni-bielefeld.de> | 2014-12-05 17:09:34 +0100 |
| commit | 5d500ea305db7185314cc2b500257529e9e9696a (patch) | |
| tree | 1322c9fe1246c3b7566085f3188fa2c739140d30 /src/core/CSS.hpp | |
| parent | 2dd08daa56c05d6c720a30fd9ec14a2471f81c5f (diff) | |
Successfully (hopefully) implemented CSS Parsing and the respective test.
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); }; /** |