[Boost-commit] svn:boost r78306 - in branches/release: boost/locale libs/locale libs/locale/src libs/locale/src/icu

Subject: [Boost-commit] svn:boost r78306 - in branches/release: boost/locale libs/locale libs/locale/src libs/locale/src/icu
From: artyomtnk_at_[hidden]
Date: 2012-05-02 09:49:26

Author: artyom
Date: 2012-05-02 09:49:25 EDT (Wed, 02 May 2012)
New Revision: 78306
URL: http://svn.boost.org/trac/boost/changeset/78306

Log:
Lineup with trunk

Properties modified: 
   branches/release/boost/locale/   (props changed)
   branches/release/libs/locale/   (props changed)
   branches/release/libs/locale/src/   (props changed)
Text files modified: 
   branches/release/boost/locale/utf.hpp                          |    38 +++++++++++++++++++-------------------  
   branches/release/libs/locale/src/icu/predefined_formatters.hpp |     4 ++--                                    
   2 files changed, 21 insertions(+), 21 deletions(-)

Modified: branches/release/boost/locale/utf.hpp
==============================================================================
--- branches/release/boost/locale/utf.hpp	(original)
+++ branches/release/boost/locale/utf.hpp	2012-05-02 09:49:25 EDT (Wed, 02 May 2012)
@@ -280,23 +280,23 @@
         template<typename Iterator>
         static Iterator encode(code_point value,Iterator out)
         {
-            if(value <=0x7F) {
-                *out++ = value;
+            if(value <= 0x7F) {
+                *out++ = static_cast<char_type>(value);
             }
-            else if(value <=0x7FF) {
-                *out++=(value >> 6) | 0xC0;
-                *out++=(value & 0x3F) | 0x80;
-            }
-            else if(BOOST_LOCALE_LIKELY(value <=0xFFFF)) {
-                *out++=(value >> 12) | 0xE0;
-                *out++=((value >> 6) & 0x3F) | 0x80;
-                *out++=(value & 0x3F) | 0x80;
+            else if(value <= 0x7FF) {
+                *out++ = static_cast<char_type>((value >> 6) | 0xC0);
+                *out++ = static_cast<char_type>((value & 0x3F) | 0x80);
+            }
+            else if(BOOST_LOCALE_LIKELY(value <= 0xFFFF)) {
+                *out++ = static_cast<char_type>((value >> 12) | 0xE0);
+                *out++ = static_cast<char_type>(((value >> 6) & 0x3F) | 0x80);
+                *out++ = static_cast<char_type>((value & 0x3F) | 0x80);
             }
             else {
-                *out++=(value >> 18) | 0xF0;
-                *out++=((value >> 12) & 0x3F) | 0x80;
-                *out++=((value >> 6) & 0x3F) | 0x80;
-                *out++=(value & 0x3F) | 0x80;
+                *out++ = static_cast<char_type>((value >> 18) | 0xF0);
+                *out++ = static_cast<char_type>(((value >> 12) & 0x3F) | 0x80);
+                *out++ = static_cast<char_type>(((value >> 6) & 0x3F) | 0x80);
+                *out++ = static_cast<char_type>((value & 0x3F) | 0x80);
             }
             return out;
         }
@@ -380,12 +380,12 @@
         static It encode(code_point u,It out)
         {
             if(BOOST_LOCALE_LIKELY(u<=0xFFFF)) {
-                *out++ = u;
+                *out++ = static_cast<char_type>(u);
             }
             else {
-                u-=0x10000;
-                *out++=0xD800 | (u>>10);
-                *out++=0xDC00 | (u & 0x3FF);
+                u -= 0x10000;
+                *out++ = static_cast<char_type>(0xD800 | (u>>10));
+                *out++ = static_cast<char_type>(0xDC00 | (u & 0x3FF));
             }
             return out;
         }
@@ -434,7 +434,7 @@
         template<typename It>
         static It encode(code_point u,It out)
         {
-            *out++ = u;
+            *out++ = static_cast<char_type>(u);
             return out;
         }
 

Modified: branches/release/libs/locale/src/icu/predefined_formatters.hpp
==============================================================================
--- branches/release/libs/locale/src/icu/predefined_formatters.hpp	(original)
+++ branches/release/libs/locale/src/icu/predefined_formatters.hpp	2012-05-02 09:49:25 EDT (Wed, 02 May 2012)
@@ -124,10 +124,10 @@
                     ap.reset(icu::NumberFormat::createPercentInstance(locale_,err));
                     break;
                 case fmt_spell:
-                    ap.reset(new icu::RuleBasedNumberFormat(URBNF_SPELLOUT,locale_,err));
+                    ap.reset(new icu::RuleBasedNumberFormat(icu::URBNF_SPELLOUT,locale_,err));
                     break;
                 case fmt_ord:
-                    ap.reset(new icu::RuleBasedNumberFormat(URBNF_ORDINAL,locale_,err));
+                    ap.reset(new icu::RuleBasedNumberFormat(icu::URBNF_ORDINAL,locale_,err));
                     break;
                 default:
                     throw std::runtime_error("locale::internal error should not get there");