From fea8db080353e408a38ad9b66b50b1c9dfaf96de Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Sat, 19 Dec 2020 17:12:05 +0300
Subject: Various fixes

---
 libxsd/xsd/cxx/parser/validating/xml-schema-pimpl.txx | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'libxsd/xsd/cxx/parser/validating')

diff --git a/libxsd/xsd/cxx/parser/validating/xml-schema-pimpl.txx b/libxsd/xsd/cxx/parser/validating/xml-schema-pimpl.txx
index 5ef2455..7bf2523 100644
--- a/libxsd/xsd/cxx/parser/validating/xml-schema-pimpl.txx
+++ b/libxsd/xsd/cxx/parser/validating/xml-schema-pimpl.txx
@@ -5,6 +5,7 @@
 #include <locale>
 
 #ifdef XSD_CXX11
+#  include <cmath>   // std::isfinite
 #  include <utility> // std::move
 #endif
 
@@ -716,9 +717,13 @@ namespace xsd
           zc_istream<C> is (str);
           is.imbue (std::locale::classic ());
 
-          //@@ TODO: now we accept scientific notations and INF/NaN.
+          // Note that std::isfinite() returns false for INF/NaN.
           //
+#ifdef XSD_CXX11
+          if (!(is >> value_ && std::isfinite (value_) && is.exhausted ()))
+#else
           if (!(is >> value_ && is.exhausted ()))
+#endif
             throw invalid_value<C> (bits::decimal<C> (), str);
         }
 
-- 
cgit v1.1