diff options
| author | Brad Pitcher <bradpitcher@gmail.com> | 2011-11-01 17:15:35 (GMT) |
|---|---|---|
| committer | Brad Pitcher <bradpitcher@gmail.com> | 2011-11-01 17:15:35 (GMT) |
| commit | e2caf3726d68ff1fef63113519049abffc0563af (patch) | |
| tree | 6558c6f03ccc21e7138d23861f80e8d97b09e60e /src/color.cc | |
| parent | 7541854212d6c1223e015faf55a6ca0657a1c184 (diff) | |
| parent | cb56f700b1b0f4ae589da62a5fd1d4e368deb604 (diff) | |
merge master
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"; } |