From df9d96054c3ede04ed383449dc67cb4da28bf23f Mon Sep 17 00:00:00 2001 From: Robert Ramey Date: Thu, 22 Jul 2004 15:50:16 +0000 Subject: [PATCH] correct error for intel compiler [SVN r23960] --- include/boost/utf8_codecvt_facet.hpp | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/include/boost/utf8_codecvt_facet.hpp b/include/boost/utf8_codecvt_facet.hpp index c567c5e..663d65b 100644 --- a/include/boost/utf8_codecvt_facet.hpp +++ b/include/boost/utf8_codecvt_facet.hpp @@ -48,21 +48,20 @@ // specialized on those types for this to work. #include +#include // size_t -#if defined(__COMO__) - namespace std{ +namespace std{ + #if defined(__COMO__) using ::mbstate_t; - } // namespace std -#elif (defined(BOOST_MSVC) && (_MSC_VER <= 1300)) - namespace std{ + #elif defined(BOOST_MSVC) using ::mbstate_t; - } // namespace std -#elif defined(BOOST_NO_STDC_NAMESPACE) - namespace std{ + #elif defined(BOOST_INTEL) + using ::mbstate_t; + #elif defined(BOOST_NO_STDC_NAMESPACE) using ::codecvt; using ::mbstate_t; - } // namespace std -#endif + #endif +} // namespace std // maximum lenght of a multibyte string #define MB_LENGTH_MAX 8 @@ -135,7 +134,7 @@ protected: const std::mbstate_t &, const char * from, const char * from_end, - size_t max_limit + std::size_t max_limit ) const throw(); // Largest possible value do_length(state,from,from_end,1) could return. @@ -181,7 +180,7 @@ protected: const std::mbstate_t&, const char * from, const char * from_end, - size_t max_limit + std::size_t max_limit ) const; }; #endif