diff options
| author | Marius Kintel <marius@kintel.net> | 2011-10-26 23:00:47 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2011-10-26 23:00:47 (GMT) |
| commit | 5299fcb27d61937f067932f984171a6fecc65592 (patch) | |
| tree | 963b94a8866243786d547ab19673c62a6dcbbb67 /src/color.cc | |
| parent | 44ef8290c4d36be2d7eef4cd39523f205dd39258 (diff) | |
| parent | 3080932440266b1f67ba106a536f3e6e6305fa80 (diff) | |
Merge branch 'master' into visitortests
Diffstat (limited to 'src/color.cc')
| -rw-r--r-- | src/color.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/color.cc b/src/color.cc index ee8f872..3c6942c 100644 --- a/src/color.cc +++ b/src/color.cc @@ -42,8 +42,6 @@ public: virtual AbstractNode *evaluate(const Context *ctx, const ModuleInstantiation *inst) const; }; -using std::string; - AbstractNode *ColorModule::evaluate(const Context *ctx, const ModuleInstantiation *inst) const { ColorNode *node = new ColorNode(inst); @@ -87,7 +85,7 @@ AbstractNode *ColorModule::evaluate(const Context *ctx, const ModuleInstantiatio return node; } -string ColorNode::toString() const +std::string ColorNode::toString() const { std::stringstream stream; @@ -96,7 +94,7 @@ string ColorNode::toString() const return stream.str(); } -string ColorNode::name() const +std::string ColorNode::name() const { return "color"; } |