mirror of
https://github.com/boostorg/detail.git
synced 2025-07-31 12:57:14 +02:00
correct error for intel compiler
[SVN r23960]
This commit is contained in:
@@ -48,21 +48,20 @@
|
|||||||
// specialized on those types for this to work.
|
// specialized on those types for this to work.
|
||||||
|
|
||||||
#include <locale>
|
#include <locale>
|
||||||
|
#include <cstddef> // size_t
|
||||||
|
|
||||||
#if defined(__COMO__)
|
namespace std{
|
||||||
namespace std{
|
#if defined(__COMO__)
|
||||||
using ::mbstate_t;
|
using ::mbstate_t;
|
||||||
} // namespace std
|
#elif defined(BOOST_MSVC)
|
||||||
#elif (defined(BOOST_MSVC) && (_MSC_VER <= 1300))
|
|
||||||
namespace std{
|
|
||||||
using ::mbstate_t;
|
using ::mbstate_t;
|
||||||
} // namespace std
|
#elif defined(BOOST_INTEL)
|
||||||
#elif defined(BOOST_NO_STDC_NAMESPACE)
|
using ::mbstate_t;
|
||||||
namespace std{
|
#elif defined(BOOST_NO_STDC_NAMESPACE)
|
||||||
using ::codecvt;
|
using ::codecvt;
|
||||||
using ::mbstate_t;
|
using ::mbstate_t;
|
||||||
} // namespace std
|
#endif
|
||||||
#endif
|
} // namespace std
|
||||||
|
|
||||||
// maximum lenght of a multibyte string
|
// maximum lenght of a multibyte string
|
||||||
#define MB_LENGTH_MAX 8
|
#define MB_LENGTH_MAX 8
|
||||||
@@ -135,7 +134,7 @@ protected:
|
|||||||
const std::mbstate_t &,
|
const std::mbstate_t &,
|
||||||
const char * from,
|
const char * from,
|
||||||
const char * from_end,
|
const char * from_end,
|
||||||
size_t max_limit
|
std::size_t max_limit
|
||||||
) const throw();
|
) const throw();
|
||||||
|
|
||||||
// Largest possible value do_length(state,from,from_end,1) could return.
|
// Largest possible value do_length(state,from,from_end,1) could return.
|
||||||
@@ -181,7 +180,7 @@ protected:
|
|||||||
const std::mbstate_t&,
|
const std::mbstate_t&,
|
||||||
const char * from,
|
const char * from,
|
||||||
const char * from_end,
|
const char * from_end,
|
||||||
size_t max_limit
|
std::size_t max_limit
|
||||||
) const;
|
) const;
|
||||||
};
|
};
|
||||||
#endif
|
#endif
|
||||||
|
Reference in New Issue
Block a user