diff options
| author | Don Bright <hugh.m.bright@gmail.com> | 2011-12-07 01:08:51 (GMT) |
|---|---|---|
| committer | Don Bright <hugh.m.bright@gmail.com> | 2011-12-07 01:08:51 (GMT) |
| commit | 2c90eaa189cd5bc96ef56e89f2841d36f54d0ae2 (patch) | |
| tree | 9f732cf3913312bfb99dc79253bef906864c34b5 /src/expr.cc | |
| parent | 750f3c8fc94744d6cc4c62de6ac86595cb2b38b6 (diff) | |
| parent | bb0ec94290733835df0716531c30460fc5b5210a (diff) | |
Merge remote branch 'upstream/master' into cakebaby
Conflicts:
tests/CMakeLists.txt
tests/csgtestcore.cc
Diffstat (limited to 'src/expr.cc')
| -rw-r--r-- | src/expr.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/expr.cc b/src/expr.cc index 7e1a25b..66a0d11 100644 --- a/src/expr.cc +++ b/src/expr.cc @@ -86,7 +86,7 @@ Value Expression::evaluate(const Context *context) const return *v1.vec[i]; } if (v1.type == Value::STRING && v2.type == Value::NUMBER) { - int i = (int)(v2.num); + int i = int(v2.num); if (i >= 0 && i < v1.text.size()) return Value(v1.text.substr(i, 1)); } |