avoid conflict with standard library implementations

[SVN r86722]
This commit is contained in:
Robert Ramey
2013-11-16 18:49:28 +00:00
parent 54822d775b
commit c1b71a6f12

View File

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