[Boost-commit] svn:boost r75240 - in trunk/boost/ratio: . detail

Subject: [Boost-commit] svn:boost r75240 - in trunk/boost/ratio: . detail
From: vicente.botet_at_[hidden]
Date: 2011-11-01 16:55:29

Author: viboes
Date: 2011-11-01 16:55:28 EDT (Tue, 01 Nov 2011)
New Revision: 75240
URL: http://svn.boost.org/trac/boost/changeset/75240

Log:
Ratio: Fix Ticket #5724 and type with u32string
Text files modified: 
   trunk/boost/ratio/detail/overflow_helpers.hpp |     8 ++++----                                
   trunk/boost/ratio/ratio_io.hpp                |     6 +++---                                  
   2 files changed, 7 insertions(+), 7 deletions(-)

Modified: trunk/boost/ratio/detail/overflow_helpers.hpp
==============================================================================
--- trunk/boost/ratio/detail/overflow_helpers.hpp	(original)
+++ trunk/boost/ratio/detail/overflow_helpers.hpp	2011-11-01 16:55:28 EDT (Tue, 01 Nov 2011)
@@ -242,8 +242,8 @@
              >
          >::type type;
   };
-  template <class R>
-  struct ratio_add<R, ratio<0> >
+  template <class R, boost::intmax_t D>
+  struct ratio_add<R, ratio<0,D> >
   {
     typedef R type;
   };
@@ -274,8 +274,8 @@
          >::type type;
   };
   
-  template <class R>
-  struct ratio_subtract<R, ratio<0> >
+  template <class R, boost::intmax_t D>
+  struct ratio_subtract<R, ratio<0,D> >
   {
     typedef R type;
   };

Modified: trunk/boost/ratio/ratio_io.hpp
==============================================================================
--- trunk/boost/ratio/ratio_io.hpp	(original)
+++ trunk/boost/ratio/ratio_io.hpp	2011-11-01 16:55:28 EDT (Tue, 01 Nov 2011)
@@ -418,9 +418,9 @@
 struct ratio_string<milli, char16_t>
 {
     static std::u16string short_name() {return std::u16string(1, u'm');}
-    static std::u32string long_name()  {return std::u16string(u"milli");}
-    static std::u32string symbol() {return short_name();}
-    static std::u32string prefix() {return long_name();}
+    static std::u16string long_name()  {return std::u16string(u"milli");}
+    static std::u16string symbol() {return short_name();}
+    static std::u16string prefix() {return long_name();}
 };
 
 template <>