Subject: [Boost-commit] svn:boost r86722 - branches/release/boost/detail
From: ramey_at_[hidden]
Date: 2013-11-16 13:49:28
Author: ramey
Date: 2013-11-16 13:49:28 EST (Sat, 16 Nov 2013)
New Revision: 86722
URL: http://svn.boost.org/trac/boost/changeset/86722
Log:
avoid conflict with standard library implementations
Properties modified:
branches/release/boost/detail/utf8_codecvt_facet.hpp (props changed)
Text files modified:
branches/release/boost/detail/utf8_codecvt_facet.ipp | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
Modified: branches/release/boost/detail/utf8_codecvt_facet.ipp
==============================================================================
--- branches/release/boost/detail/utf8_codecvt_facet.ipp Sat Nov 16 11:25:26 2013 (r86721)
+++ branches/release/boost/detail/utf8_codecvt_facet.ipp 2013-11-16 13:49:28 EST (Sat, 16 Nov 2013) (r86722)
@@ -171,14 +171,13 @@
// 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
-#if BOOST_WORKAROUND(__IBMCPP__, BOOST_TESTED_AT(600))
-) const throw()
-#else
) const
+#if BOOST_WORKAROUND(__IBMCPP__, BOOST_TESTED_AT(600))
+ throw()
#endif
{
// RG - this code is confusing! I need a better way to express it.