summaryrefslogtreecommitdiff
path: root/src/value.cc
diff options
context:
space:
mode:
authorMarius Kintel <marius@kintel.net>2013-10-13 17:19:34 (GMT)
committerMarius Kintel <marius@kintel.net>2013-10-13 17:19:34 (GMT)
commite77615be3027cfe365e3e52f3ed609dae9711028 (patch)
tree21babea118b3bc59037e4e487a4c6bd6811b5412 /src/value.cc
parent0f22d6e9ad562e87ae484a82df56ddee30e87343 (diff)
parent4401a136b9cbf01aa99cfdf5d9d67d62579dd853 (diff)
Merge branch 'children' of git://github.com/vicnet/openscad into vicnet-children
Conflicts: tests/CMakeLists.txt
Diffstat (limited to 'src/value.cc')
-rw-r--r--src/value.cc9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/value.cc b/src/value.cc
index a281409..ac33a3b 100644
--- a/src/value.cc
+++ b/src/value.cc
@@ -117,11 +117,6 @@ Value::Value(const RangeType &v) : value(v)
// std::cout << "creating range\n";
}
-Value::Value(double begin, double step, double end) : value(RangeType(begin, step, end))
-{
- // std::cout << "creating range from numbers\n";
-}
-
Value::ValueType Value::type() const
{
return static_cast<ValueType>(this->value.which());
@@ -590,7 +585,7 @@ public:
Value operator()(const std::string &str, const double &idx) const {
int i = int(idx);
Value v;
- if (i >= 0 && i < str.size()) {
+ if ((i >= 0) && (i < (int)str.size())) {
v = Value(str[int(idx)]);
// std::cout << "bracket_visitor: " << v << "\n";
}
@@ -599,7 +594,7 @@ public:
Value operator()(const Value::VectorType &vec, const double &idx) const {
int i = int(idx);
- if (i >= 0 && i < vec.size()) return vec[int(idx)];
+ if ((i >= 0) && (i < (int)vec.size())) return vec[int(idx)];
return Value::undefined;
}
contact: Jan Huwald // Impressum