comparison DEPENDENCIES/generic/include/boost/detail/utf8_codecvt_facet.ipp @ 101:c530137014c0

Update Boost headers (1.58.0)

 }
 
 // How many char objects can I process to get <= max_limit
 // wchar_t objects?
 int utf8_codecvt_facet::do_length(
-    BOOST_CODECVT_DO_LENGTH_CONST std::mbstate_t &,
+    const std::mbstate_t &,
     const char * from,
     const char * from_end, 
     std::size_t max_limit
+) const
 #if BOOST_WORKAROUND(__IBMCPP__, BOOST_TESTED_AT(600))
-) const throw()
-#else
-) const
+        throw()
 #endif
 { 
     // RG - this code is confusing!  I need a better way to express it.
     // and test cases.
 

     else if (0xe0 <= lead_octet && lead_octet <= 0xef) return 3;
     else if (0xf0 <= lead_octet && lead_octet <= 0xf7) return 4;
     else if (0xf8 <= lead_octet && lead_octet <= 0xfb) return 5;
     else return 6;
 }
-BOOST_UTF8_END_NAMESPACE
-
-namespace {
+
+namespace detail {
+
 template<std::size_t s>
 int get_cont_octet_out_count_impl(wchar_t word){
     if (word < 0x80) {
         return 0;
     }

 #else
     return 2;
 #endif
 }
 
-} // namespace anonymous
-
-BOOST_UTF8_BEGIN_NAMESPACE
+} // namespace detail
+
 // How many "continuing octets" will be needed for this word
 // ==   total octets - 1.
 int utf8_codecvt_facet::get_cont_octet_out_count(
     wchar_t word
 ) const {
-    return get_cont_octet_out_count_impl<sizeof(wchar_t)>(word);
+    return detail::get_cont_octet_out_count_impl<sizeof(wchar_t)>(word);
 }
 BOOST_UTF8_END_NAMESPACE
 
 #endif