Ticket #7187: rational-wide-streams.patch

boost/rational.hpp

@@ -525 +525 @@
 
     // A utility class to reset the format flags for an istream at end
     // of scope, even in case of exceptions
+    template <typename CharType>
     struct resetter {
-        resetter(std::istream& is) : is_(is), f_(is.flags()) {}
+        resetter(std::basic_istream<CharType>& is) : is_(is), f_(is.flags()) {}
         ~resetter() { is_.flags(f_); }
-        std::istream& is_;
-        std::istream::fmtflags f_;      // old GNU c++ lib has no ios_base
+        std::basic_istream<CharType>& is_;
+        typename std::basic_istream<CharType>::fmtflags f_; // old GNU c++ lib has no ios_base
     };
 
 }
 
 // Input and output
-template <typename IntType>
-std::istream& operator>> (std::istream& is, rational<IntType>& r)
+template <typename CharType, typename IntType>
+std::basic_istream<CharType>& operator>> (std::basic_istream<CharType>& is,
+                                          rational<IntType>& r)
 {
     IntType n = IntType(0), d = IntType(1);
-    char c = 0;
-    detail::resetter sentry(is);
+    CharType c = 0;
+    detail::resetter<CharType> sentry(is);
 
     is >> n;
     c = is.get();
 
-    if (c != '/')
-        is.clear(std::istream::badbit);  // old GNU c++ lib has no ios_base
+    if (c != static_cast<CharType>('/'))
+        is.clear(std::basic_istream<CharType>::badbit);  // old GNU c++ lib has no ios_base
 
 #if !defined(__GNUC__) || (defined(__GNUC__) && (__GNUC__ >= 3)) || defined __SGI_STL_PORT
     is >> std::noskipws;
@@ -562 +564 @@
 }
 
 // Add manipulators for output format?
-template <typename IntType>
-std::ostream& operator<< (std::ostream& os, const rational<IntType>& r)
+template <typename CharType, typename IntType>
+std::basic_ostream<CharType>& operator<< (std::basic_ostream<CharType>& os,
+                                          const rational<IntType>& r)
 {
-    os << r.numerator() << '/' << r.denominator();
+    os << r.numerator() << static_cast<CharType>('/') << r.denominator();
     return os;
 }