diff options
| author | Don Bright <hugh.m.bright@gmail.com> | 2011-10-16 18:13:18 (GMT) |
|---|---|---|
| committer | Don Bright <hugh.m.bright@gmail.com> | 2011-10-16 18:13:18 (GMT) |
| commit | 4159e9dc5f140c659725f97a5f5cd284a47affd5 (patch) | |
| tree | 2ea52792e5f084ac2199425599ae2d6632483866 /src | |
| parent | c0592dc3b833a91457e28a6d80bcc58c1bb7938d (diff) | |
| parent | b12b0861756d99c876a243ad5bda85da1a066ac5 (diff) | |
Merge remote branch 'upstream/visitortests' into visitortests
Diffstat (limited to 'src')
| -rw-r--r-- | src/func.cc | 1 | ||||
| -rw-r--r-- | src/openscad.h | 6 | ||||
| -rw-r--r-- | src/value.cc | 6 |
3 files changed, 3 insertions, 10 deletions
diff --git a/src/func.cc b/src/func.cc index 75e90df..b011a27 100644 --- a/src/func.cc +++ b/src/func.cc @@ -34,7 +34,6 @@ #include <algorithm> #include "stl-utils.h" #include <boost/foreach.hpp> -#include "openscad.h" //M_PI AbstractFunction::~AbstractFunction() { diff --git a/src/openscad.h b/src/openscad.h index e6b9b9f..61aec0e 100644 --- a/src/openscad.h +++ b/src/openscad.h @@ -27,12 +27,6 @@ #ifndef OPENSCAD_H #define OPENSCAD_H -// for win32 and maybe others.. -#ifndef M_PI -# define M_PI 3.14159265358979323846 -#endif - - extern class AbstractModule *parse(const char *text, const char *path, int debug); extern int get_fragments_from_r(double r, double fn, double fs, double fa); diff --git a/src/value.cc b/src/value.cc index 685bf81..6685594 100644 --- a/src/value.cc +++ b/src/value.cc @@ -352,19 +352,19 @@ std::string Value::toString() const stream << ']'; break; case RANGE: - stream << "[ " + stream << '[' << this->range_begin << " : " << this->range_step << " : " << this->range_end - << " ]"; + << ']'; break; case NUMBER: stream << this->num; break; case BOOL: - stream << this->b; + stream << (this->b ? "true" : "false"); break; default: stream << "undef"; |