Merge remote-tracking branch 'upstream/master' into fonts_search_example

1 files changed, 4 insertions, 0 deletions

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);