diff options
| author | Marius Kintel <marius@kintel.net> | 2012-02-18 18:17:22 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2012-02-18 18:17:22 (GMT) |
| commit | cf52a2a1ef1a7af5ed07d3e4fce1ad430f1321ef (patch) | |
| tree | 969ae75e9a86bbbdb77e626903d4b47fead8b8f5 | |
| parent | cd0218d9aa665db78a0f74f6a95f29b68100494e (diff) | |
| parent | 45c180e8e36a5ee4bf1d7d611ac3f8127688420a (diff) | |
Merge branch 'master' of github.com:openscad/openscad
| -rw-r--r-- | .gitmodules | 2 | ||||
| -rw-r--r-- | src/value.cc | 4 | ||||
| -rw-r--r-- | tests/CMakeLists.txt | 1 |
3 files changed, 6 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules index 4ab4cf0..6556377 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "libraries/MCAD"] path = libraries/MCAD - url = git@github.com:openscad/MCAD.git + url = ../MCAD.git diff --git a/src/value.cc b/src/value.cc index 48fea1a..c9dbd55 100644 --- a/src/value.cc +++ b/src/value.cc @@ -426,6 +426,10 @@ std::string Value::toString() const // Quick and dirty hack to work around floating point rounding differences // across platforms for testing purposes. { + if (this->num != this->num) { // Fix for avoiding nan vs. -nan across platforms + stream << "nan"; + break; + } std::stringstream tmp; tmp.precision(12); tmp.setf(std::ios_base::fixed); diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 0e74f58..881a750 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -657,6 +657,7 @@ disable_tests(dumptest_transform-tests dumptest_render-tests dumptest_difference-tests dumptest_intersection-tests + dumptest_text-search-test dumptest_example001 dumptest_example005 dumptest_example006 |